Merge remote-tracking branch 'upstream/develop' into 1706-ostatus-attach

[friendica.git] / update.php

diff --git a/update.php b/update.php
index ea0c57535349b902995ff7f186d93db9b8d6e9b6..d89e9ca06dc4e7369e65d8f05ae30d5779990a27 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1219);
+define('UPDATE_VERSION' , 1232);
 
 /**
  *
@@ -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');
@@ -1729,3 +1729,8 @@ function update_1202() {
        $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
                dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP));
 }
+
+function update_1231() {
+       // For this special case we have to use the old update routine
+       $r = q("ALTER TABLE `workerqueue` ADD `done` tinyint(1) NOT NULL DEFAULT 0");
+}