Merge pull request #4037 from annando/bugfix-4036

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 7fbdec7079532c8d00cd0e378aa50fd0769a54ea..751e15b587bf7dbbe06012210f00eca3530cc017 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,12 +1,13 @@
 <?php
 
-define('UPDATE_VERSION' , 1235);
+define('UPDATE_VERSION' , 1236);
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-use Friendica\Object\Photo;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
 
 /**
  *
@@ -153,10 +154,10 @@ function update_1014()
        $r = q("SELECT * FROM `photo` WHERE `scale` = 4");
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
-                       $ph = new Photo($rr['data']);
-                       if ($ph->isValid()) {
-                               $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));
                        }
                }
        }
@@ -1484,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);