Merge pull request #3755 from tobiasd/CHANGELOG-3.5.5

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 8da76336fc318d97134c85046348cc6c1b88a615..b0046f17a7f4ce4601d60c8e22d06e5f5d161594 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1220);
+define('UPDATE_VERSION' , 1234);
 
 /**
  *
@@ -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",
@@ -1652,7 +1652,7 @@ function update_1180() {
 
 function update_1188() {
 
-       if (strlen(get_config('system','directory_submit_url')) AND
+       if (strlen(get_config('system','directory_submit_url')) &&
                !strlen(get_config('system','directory'))) {
                set_config('system','directory', dirname(get_config('system','directory_submit_url')));
                del_config('system','directory_submit_url');