allow users to set categories on their posts

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index a9fb807add3289067ed6725af2505b9df404e6c5..df92a40ed000addbe70678ddae0200c1eff3932a 100755 (executable)
--- 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'),