diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-10-09 17:49:55 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-10-09 17:49:55 +0200 |
| commit | 5698462588066b942d7f8784d06942385db8daa4 (patch) | |
| tree | 15e65d68fc7a0c8bbe06143e4d8da23a6b8e8585 /Zotlabs | |
| parent | f99c007187b83755d7b1c80c63fde7c1162a99c4 (diff) | |
| parent | 23812e5b48b7a4d4f0c275c0fbb3d244a582397c (diff) | |
| download | volse-hubzilla-5698462588066b942d7f8784d06942385db8daa4.tar.gz volse-hubzilla-5698462588066b942d7f8784d06942385db8daa4.tar.bz2 volse-hubzilla-5698462588066b942d7f8784d06942385db8daa4.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadStream.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index c4f4038dc..f13fbe362 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -383,6 +383,13 @@ class Apps { $install_action = (($installed) ? t('Update') : t('Install')); $icon = ((strpos($papp['photo'],'icon:') === 0) ? substr($papp['photo'],5) : ''); + if($mode === 'navbar') { + return replace_macros(get_markup_template('app_nav.tpl'),array( + '$app' => $papp, + '$icon' => $icon, + )); + } + return replace_macros(get_markup_template('app.tpl'),array( '$app' => $papp, '$icon' => $icon, diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php index d7a898704..436723f8c 100644 --- a/Zotlabs/Lib/ThreadStream.php +++ b/Zotlabs/Lib/ThreadStream.php @@ -68,7 +68,7 @@ class ThreadStream { // pull some trickery which allows us to re-invoke this function afterward // it's an ugly hack so @FIXME $this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'); - $this->uploadable = false; + $this->uploadable = perm_is_allowed($this->profile_owner,$ob_hash,'write_storage'); break; case 'page': $this->profile_owner = \App::$profile['uid']; diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index d126cb3da..ca664cba6 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -121,6 +121,11 @@ class Comanche { if($cnt) \App::$layout['theme'] = trim($matches[1]); + $cnt = preg_match("/\[navbar\](.*?)\[\/navbar\]/ism", $s, $matches); + if($cnt) + \App::$layout['navbar'] = trim($matches[1]); + + $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { // only the last webpage definition is used if there is more than one |