diff options
| author | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
|---|---|---|
| committer | Einer von Vielen <tomwie@users.sourceforge.net> | 2015-01-14 22:49:16 +0100 |
| commit | dfab2416926631b7b08c6c89b62528ca2520f130 (patch) | |
| tree | 6c76af9d656eec6e74ed6c3c05d7ccc2b6ef5e48 /include/text.php | |
| parent | 09129cbe5f7e8cb331b68469b74438464960af0b (diff) | |
| parent | 7090b58f68251b8c4b39332f2ea051e95ead3df3 (diff) | |
| download | volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.gz volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.tar.bz2 volse-hubzilla-dfab2416926631b7b08c6c89b62528ca2520f130.zip | |
Merge remote-tracking branch 'upstream/master' into toc
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/text.php b/include/text.php index 035c092a6..18ef22d28 100644 --- a/include/text.php +++ b/include/text.php @@ -92,10 +92,10 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') { return escape_tags($s); if($type == 'text/plain') return escape_tags($s); - $r = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", + $r = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", intval($channel_id) ); - if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) { + if($r && (($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { if(local_user() && (get_account_id() == $r[0]['account_id'])) { return $s; } @@ -1584,13 +1584,13 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { 'text/plain' ); - $r = q("select account_id, account_roles from account left join channel on account_id = channel_account_id where + $r = q("select account_id, account_roles, channel_pageflags from account left join channel on account_id = channel_account_id where channel_id = %d limit 1", intval($channel_id) ); if($r) { - if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { + if(($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) { if(local_user() && get_account_id() == $r[0]['account_id']) $x[] = 'application/x-php'; } @@ -2351,7 +2351,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) { return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]); } -function linkify_tags($a, &$body, $uid, $profile_uid) { +function linkify_tags($a, &$body, $uid) { $str_tags = ''; $tagged = array(); $result = array(); |