Merge remote-tracking branch 'upstream/develop' into 1701-index-again

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index ccfc070d4e2d416be818e142fa65a73486cfb8b6..571e2facedfb1a89b0a803bf7bb4ff9b08e0552e 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -78,7 +78,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
        $newbody .= $origbody;
 
        $cnt = 0;
-       foreach($images as $image) {
+       foreach ($images as $image) {
                // We're depending on the property of 'foreach' (specified on the PHP website) that
                // it loops over the array starting from the first element and going sequentially
                // to the last element
@@ -466,7 +466,7 @@ function item_condition() {
  */
 
 if(!function_exists('conversation')) {
-function conversation(&$a, $items, $mode, $update, $preview = false) {
+function conversation(App $a, $items, $mode, $update, $preview = false) {
 
        require_once('include/bbcode.php');
        require_once('include/Contact.php');