X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=65f8bd2d755fa1f095b9416fdd308a8250c8a699;hb=95aa77647bee6303eb1abe2949ec0608d59d020e;hp=0e655e83db211bfefdd0feab13da905f14b1164d;hpb=89e74202371c4e3b37488e1251818e8fcf3287fe;p=friendica.git diff --git a/update.php b/update.php index 0e655e83db..65f8bd2d75 100644 --- a/update.php +++ b/update.php @@ -49,7 +49,6 @@ use Friendica\Core\Update; use Friendica\Core\Worker; use Friendica\Database\Database; use Friendica\Database\DBA; -use Friendica\Database\DBStructure; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Item; @@ -316,33 +315,6 @@ function update_1351() return Update::SUCCESS; } - -function pre_update_1354() -{ - if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist']) - && !DBStructure::existsColumn('contact', ['ffi_keyword_denylist']) - && !DBA::e("ALTER TABLE `contact` CHANGE `ffi_keyword_blacklist` `ffi_keyword_denylist` text null")) { - return Update::FAILED; - } - return Update::SUCCESS; -} - -function update_1354() -{ - if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist']) - && DBStructure::existsColumn('contact', ['ffi_keyword_denylist'])) { - if (!DBA::e("UPDATE `contact` SET `ffi_keyword_denylist` = `ffi_keyword_blacklist`")) { - return Update::FAILED; - } - - // When the data had been copied then the main task is done. - // Having the old field removed is only beauty but not crucial. - // So we don't care if this was successful or not. - DBA::e("ALTER TABLE `contact` DROP `ffi_keyword_blacklist`"); - } - return Update::SUCCESS; -} - function update_1357() { if (!DBA::e("UPDATE `contact` SET `failed` = true WHERE `success_update` < `failure_update` AND `failed` IS NULL")) {