X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=d8a28173736e370706846ef7b02f3eca6eef0623;hb=bd91bb21b92bd95e12fe5d77de58739dbb9785fa;hp=958e974f9d0b2c9feeb8e742baf4364c2d9648d6;hpb=2f52afeeace458ff454af041a61536bbbf7382eb;p=friendica.git diff --git a/update.php b/update.php index 958e974f9d..d8a2817373 100644 --- a/update.php +++ b/update.php @@ -52,6 +52,7 @@ use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\Notify; use Friendica\Model\Photo; +use Friendica\Model\Post; use Friendica\Model\User; use Friendica\Model\Storage; use Friendica\Util\DateTimeFormat; @@ -336,7 +337,7 @@ function update_1309() continue; } - $item = Item::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]); + $item = Post::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]); if (!DBA::isResult($item)) { continue; } @@ -831,7 +832,15 @@ function pre_update_1377() return Update::FAILED; } - if (!DBA::e("DELETE FROM `diaspora-interaction` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) { + if (DBStructure::existsTable('diaspora-interaction') && !DBA::e("DELETE FROM `diaspora-interaction` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) { + return Update::FAILED; + } + + if (DBStructure::existsTable('item-activity') && !DBA::e("DELETE FROM `item-activity` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) { + return Update::FAILED; + } + + if (DBStructure::existsTable('item-content') && !DBA::e("DELETE FROM `item-content` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`)")) { return Update::FAILED; }