Fix ostatus bug related to only_full_group_by

[friendica.git] / include / post_update.php

diff --git a/include/post_update.php b/include/post_update.php
index a2b8497b9b08df3df8c5ca5097fe5bd3ef91e776..f9649961d9ca0d087d6b9a8eeea1dde591ac7305 100644 (file)
--- a/include/post_update.php
+++ b/include/post_update.php
@@ -8,17 +8,18 @@
  */
 function post_update() {
 
-       if (!post_update_1192())
+       if (!post_update_1192()) {
                return;
-
-       if (!post_update_1194())
+       }
+       if (!post_update_1194()) {
                return;
-
-       if (!post_update_1198())
+       }
+       if (!post_update_1198()) {
                return;
-
-       if (!post_update_1206())
+       }
+       if (!post_update_1206()) {
                return;
+       }
 }
 
 /**
@@ -238,18 +239,19 @@ function post_update_1206() {
 
        logger("Start", LOGGER_DEBUG);
        $r = q("SELECT `contact`.`id`, `contact`.`last-item`,
-               (SELECT MAX(`changed`) FROM `item` FORCE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
+               (SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
                FROM `user`
                INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");
 
-       if (!dbm::is_result($r))
+       if (!dbm::is_result($r)) {
                return false;
-
+       }
        foreach ($r AS $user) {
-               if (!empty($user["lastitem_date"]) AND ($user["lastitem_date"] > $user["last-item"]))
+               if (!empty($user["lastitem_date"]) AND ($user["lastitem_date"] > $user["last-item"])) {
                        q("UPDATE `contact` SET `last-item` = '%s' WHERE `id` = %d",
                                dbesc($user["lastitem_date"]),
                                intval($user["id"]));
+               }
        }
 
        set_config("system", "post_update_version", 1206);