Replace && by AND in SQL queries

diff --git a/include/queue.php b/include/queue.php
index a92f2b207492b4fcfa7bcf9157e6d96b99c251cb..5e73922f9a948daf9b939397061e8856a17f7333 100644 (file)
--- 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 83f3dada5357eaa74a8b89a1b8b09756c4734395..aaa7aa0b9e62161b0cb74f7010d122a60a1d5487 100644 (file)
--- 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",