diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-10 08:09:02 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-10 08:09:02 +0200 |
| commit | 0a96cdd950f30974fe0fecf60b214701673dad86 (patch) | |
| tree | e7ee642601cd4fd980ca6bd2a038d742c77b4369 /Zotlabs/Lib | |
| parent | 8ab3a4ebd7fd25fe4b01e92c8d2f4507b0c6ff3d (diff) | |
| download | volse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.tar.gz volse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.tar.bz2 volse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.zip | |
merge red/master into dev
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/PConfig.php | 9 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadStream.php | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php index 25478e764..2a0b18aac 100644 --- a/Zotlabs/Lib/PConfig.php +++ b/Zotlabs/Lib/PConfig.php @@ -20,11 +20,12 @@ class PConfig { if(is_null($uid) || $uid === false) return false; - if(! array_key_exists($uid, \App::$config)) - \App::$config[$uid] = array(); - if(! is_array(\App::$config)) { - btlogger('App::$config not an array: ' . $uid); + btlogger('App::$config not an array'); + } + + if(! array_key_exists($uid, \App::$config)) { + \App::$config[$uid] = array(); } if(! is_array(\App::$config[$uid])) { diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 3e76890b6..4a66c84bc 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -713,7 +713,6 @@ class ThreadItem { call_hooks('comment_buttons',$arr); $comment_buttons = $arr['comment_buttons']; - $comment_box = replace_macros($template,array( '$return_path' => '', '$threaded' => $this->is_threaded(), diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php index 1fd746c38..35ccf4fdb 100644 --- a/Zotlabs/Lib/ThreadStream.php +++ b/Zotlabs/Lib/ThreadStream.php @@ -18,6 +18,7 @@ class ThreadStream { private $observer = null; private $writable = false; private $commentable = false; + private $uploadable = false; private $profile_owner = 0; private $preview = false; private $prepared_item = ''; |