Just some more code adjustments
authorMichael Vogel <ike@pirati.ca>
Sat, 22 Oct 2016 10:21:43 +0000 (10:21 +0000)
committerMichael Vogel <ike@pirati.ca>
Sat, 22 Oct 2016 10:21:43 +0000 (10:21 +0000)
include/dba.php
include/ostatus.php

index 36986eb..d97defa 100644 (file)
@@ -159,9 +159,9 @@ class dba {
 
                $a->save_timestamp($stamp1, "database");
 
-               if (strtolower(substr($orig_sql, 0, 6)) != "select")
+               if (strtolower(substr($orig_sql, 0, 6)) != "select") {
                        $a->save_timestamp($stamp1, "database_write");
-
+               }
                if (x($a->config,'system') && x($a->config['system'],'db_log')) {
                        if (($duration > $a->config["system"]["db_loglimit"])) {
                                $duration = round($duration, 3);
index 556c81e..5dcc7d5 100644 (file)
@@ -1982,6 +1982,7 @@ class ostatus {
                                intval($authorid), dbesc($check_date),
                                dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
 /*
+               // We keep this old query until we are sure that the new one works better
                $items = q("SELECT `item`.*, `item`.`id` AS `item_id` FROM `item`
                                STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
                                LEFT JOIN `item` AS `thritem` ON `thritem`.`uri`=`item`.`thr-parent` AND `thritem`.`uid`=`item`.`uid`