aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-11 16:12:47 -0800
committerfriendica <info@friendica.com>2015-02-11 16:12:47 -0800
commit78b87548564f35be5ab04adb19d5960c3ce50356 (patch)
tree1472247571ff7315b0298948cdc509c2eb7760c8
parentc62d605608ea3cfa0430e007fe6bc7df5fa0d25f (diff)
parentb86ed864aa88ddb7e1792151ed59d3c6768752e8 (diff)
downloadvolse-hubzilla-78b87548564f35be5ab04adb19d5960c3ce50356.tar.gz
volse-hubzilla-78b87548564f35be5ab04adb19d5960c3ce50356.tar.bz2
volse-hubzilla-78b87548564f35be5ab04adb19d5960c3ce50356.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/conversation.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index ea7719d4b..17822d0d5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1672,8 +1672,17 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) {
$ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']);
$ret[$v]['title'] = $conv_responses[$v]['title'];
}
- $ret['count'] = count($ret);
+
+ $count = 0;
+ foreach($ret as $key) {
+ if ($key['count'] == true)
+ $count++;
+ }
+
+ $ret['count'] = $count;
+
//logger('ret: ' . print_r($ret,true));
+
return $ret;
}