aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-08-26 20:13:27 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-08-26 20:13:27 +0100
commit450434a6903790aacf70864633cd3ccb57b739f0 (patch)
tree812f6c723e81f398d8e2593138eafa3e1503dca9 /include/text.php
parentcc2bef67dd17ac2d9352442aeac39963470ba67f (diff)
downloadvolse-hubzilla-450434a6903790aacf70864633cd3ccb57b739f0.tar.gz
volse-hubzilla-450434a6903790aacf70864633cd3ccb57b739f0.tar.bz2
volse-hubzilla-450434a6903790aacf70864633cd3ccb57b739f0.zip
Revert - see comments.
Diffstat (limited to 'include/text.php')
-rw-r--r--[-rwxr-xr-x]include/text.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php
index 42fad13b5..410d9bc96 100755..100644
--- a/include/text.php
+++ b/include/text.php
@@ -1552,6 +1552,7 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
$x = array(
'text/bbcode',
+ 'text/html',
'text/markdown',
'text/plain'
);
@@ -1563,10 +1564,8 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
if($r) {
if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) {
- if(local_user() && get_account_id() == $r[0]['account_id']) {
- $x[] = 'text/html';
+ if(local_user() && get_account_id() == $r[0]['account_id'])
$x[] = 'application/x-php';
- }
}
}
@@ -2023,3 +2022,4 @@ function normalise_openid($s) {
return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
}
+