Merge pull request #4037 from annando/bugfix-4036

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 7530d1a386765d64afcc963b2cbf5329454d65b9..751e15b587bf7dbbe06012210f00eca3530cc017 100644 (file)
--- a/update.php
+++ b/update.php
@@ -6,6 +6,8 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
 
 /**
  *
@@ -146,16 +148,16 @@ function update_1013() {
                AFTER `object` , ADD `target` TEXT NOT NULL AFTER `target-type`");
 }
 
-function update_1014() {
-       require_once('include/Photo.php');
+function update_1014()
+{
        q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` ");
        $r = q("SELECT * FROM `photo` WHERE `scale` = 4");
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
-                       $ph = new Photo($rr['data']);
-                       if ($ph->is_valid()) {
-                               $ph->scaleImage(48);
-                               $ph->store($rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
+                       $Image = new Image($rr['data']);
+                       if ($Image->isValid()) {
+                               $Image->scaleDown(48);
+                               Photo::store($Image, $rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
                        }
                }
        }
@@ -616,7 +618,7 @@ function update_1075() {
                foreach ($r as $rr) {
                        $found = true;
                        do {
-                               $guid = substr(random_string(),0,16);
+                               $guid = random_string(16);
                                $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
                                        dbesc($guid)
                                );
@@ -1471,9 +1473,6 @@ function update_1164() {
        $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
                NETWORK_DFRN, NETWORK_DFRN);
 
-       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
-               NETWORK_ZOT, NETWORK_ZOT);
-
        $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
                NETWORK_OSTATUS, NETWORK_OSTATUS);
 
@@ -1486,9 +1485,6 @@ function update_1164() {
        $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
                NETWORK_MAIL, NETWORK_MAIL);
 
-       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
-               NETWORK_MAIL2, NETWORK_MAIL2);
-
        $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
                NETWORK_FACEBOOK, NETWORK_FACEBOOK);