Improve get_responses() prototype

diff --git a/include/conversation.php b/include/conversation.php
index e6c787915fb5dd14367fe8d5fcead8c7ea7fe4eb..682bc1455509fb73f2e71eb8d59e74b389bec002 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1464,7 +1464,7 @@ function render_location_dummy(array $item) {
        }
 }
 
-function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) {
+function get_responses(array $conv_responses, array $response_verbs, array $item, Post $ob = null) {
        $ret = [];
        foreach ($response_verbs as $v) {
                $ret[$v] = [];

diff --git a/mod/photos.php b/mod/photos.php
index 710a3873ee30812afb4a404988b96f530e3af586..137e0adb563218b312b51fc3b0dc021899df677f 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1564,7 +1564,7 @@ function photos_content(App $a)
                        }
                        $response_verbs = ['like'];
                        $response_verbs[] = 'dislike';
-                       $responses = get_responses($conv_responses, $response_verbs, '', $link_item);
+                       $responses = get_responses($conv_responses, $response_verbs, $link_item);
 
                        $paginate = $pager->renderFull($total);
                }

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 2d52f4244a6c5fbe19b10af406c5b78b8907fa13..c9e5cddb699f6ebb950cf13870a95a2f4e114ede 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -250,7 +250,7 @@ class Post extends BaseObject
                        }
                }
 
-               $responses = get_responses($conv_responses, $response_verbs, $this, $item);
+               $responses = get_responses($conv_responses, $response_verbs, $item, $this);
 
                foreach ($response_verbs as $value => $verbs) {
                        $responses[$verbs]['output'] = !empty($conv_responses[$verbs][$item['uri']]) ? format_like($conv_responses[$verbs][$item['uri']], $conv_responses[$verbs][$item['uri'] . '-l'], $verbs, $item['uri']) : '';