diff options
| author | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
| commit | 7127626f55f0ae5843d38145bf80022b98e4a8d8 (patch) | |
| tree | 59813e196f7288be421cf187c2231adedca7d4b6 /include/conversation.php | |
| parent | f39e8126773e2a030cf84c8b9d428cc78546c1b9 (diff) | |
| parent | 1f74bd1b78f7db4940f0fded0d6f7716579218f0 (diff) | |
| download | volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.gz volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.bz2 volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rwxr-xr-x | include/conversation.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index a9fb807ad..df92a40ed 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -250,7 +250,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $threads = array(); $threadsid = -1; - if(count($items)) { + if($items && count($items)) { if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { @@ -974,6 +974,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), + '$category' => "", + '$placeholdercategory' => t('Categories (comma-separated list)'), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), |