From 66da84d1a94b8f03de2995af884448a7f03e52f8 Mon Sep 17 00:00:00 2001
From: Michael Vogel <ike@pirati.ca>
Date: Sat, 22 Oct 2016 10:21:43 +0000
Subject: [PATCH] Just some more code adjustments
---
include/dba.php | 4 ++--
include/ostatus.php | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/dba.php b/include/dba.php
index 36986ebc7c..d97defa4c3 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -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);
diff --git a/include/ostatus.php b/include/ostatus.php
index 556c81e987..5dcc7d5a7e 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -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`