diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-15 15:55:33 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-15 15:55:33 -0700 |
| commit | 2dce86d38e58c0fc88c252d0a7f0b1b83a960451 (patch) | |
| tree | 6f5213216e3229e1f44754ff50afc24b17dd2d76 | |
| parent | 41c2f7477217634c2f8da3351cf10a520da6bd02 (diff) | |
| parent | 62c921815fcc832d550c5c453284e911da10692f (diff) | |
| download | volse-hubzilla-2dce86d38e58c0fc88c252d0a7f0b1b83a960451.tar.gz volse-hubzilla-2dce86d38e58c0fc88c252d0a7f0b1b83a960451.tar.bz2 volse-hubzilla-2dce86d38e58c0fc88c252d0a7f0b1b83a960451.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | Zotlabs/Module/Editwebpage.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Item.php | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index 3d4af107d..97f4a32ff 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -130,8 +130,6 @@ class Editwebpage extends \Zotlabs\Web\Controller { $layout = $itm[0]['layout_mid']; - $tpl = get_markup_template("jot.tpl"); - $rp = 'webpages/' . $which; $x = array( diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 4725ecb38..6f54d3bb1 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -480,22 +480,12 @@ class Item extends \Zotlabs\Web\Controller { $execflag = false; - if($mimetype !== 'text/bbcode') { - $z = 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($profile_uid) - ); - if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { - if($uid && (get_account_id() == $z[0]['account_id'])) { - $execflag = true; - } - else { - notice( t('Executable content type not permitted to this channel.') . EOL); - if($api_source) - return ( [ 'success' => false, 'message' => 'forbidden content type' ] ); - if(x($_REQUEST,'return')) - goaway(z_root() . "/" . $return_path ); - killme(); - } + $z = 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($profile_uid) + ); + if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { + if($uid && (get_account_id() == $z[0]['account_id'])) { + $execflag = true; } } |