From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 8 Jun 2017 02:01:14 +0000 (-0400)
Subject: Replace && by AND in SQL queries
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2281989866068f2b4f7dc3b72eb19f5bd9cdc949;p=friendica.git

Replace && by AND in SQL queries
---

diff --git a/include/queue.php b/include/queue.php
index a92f2b2074..5e73922f9a 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -44,7 +44,7 @@ function queue_run(&$argv, &$argc){
 		// For the first 12 hours we'll try to deliver every 15 minutes
 		// After that, we'll only attempt delivery once per hour.
 
-		$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+		$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
 
 		call_hooks('queue_predeliver', $a, $r);
 
diff --git a/update.php b/update.php
index 83f3dada53..aaa7aa0b9e 100644
--- a/update.php
+++ b/update.php
@@ -356,7 +356,7 @@ function update_1035() {
 
 function update_1036() {
 
-	$r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' ");
+	$r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' AND `photo` LIKE '%include/photo%' ");
 	if (dbm::is_result($r)) {
 		foreach ($r as $rr) {
 			q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",