diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php index fc0703fd95..5cc892d095 100644 --- a/src/Database/PostUpdate.php +++ b/src/Database/PostUpdate.php @@ -8,6 +8,7 @@ use Friendica\Core\Config; use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\PermissionSet; +use Friendica\Database\DBA; require_once 'include/dba.php'; diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php index e7aa572ddf..efb2cb03db 100644 --- a/src/Worker/Expire.php +++ b/src/Worker/Expire.php @@ -43,11 +43,6 @@ class Expire if (!empty($row['psid']) && !DBA::exists('item', ['psid' => $row['psid']])) { DBA::delete('permissionset', ['id' => $row['psid']]); } - // When the permission set will be used in photo and events as well. - // this query here needs to be extended. - if (!empty($row['psid']) && !dba::exists('item', ['psid' => $row['psid']])) { - dba::delete('permissionset', ['id' => $row['psid']]); - } } DBA::close($rows); diff --git a/update.php b/update.php index 257623ac74..56f285f2df 100644 --- a/update.php +++ b/update.php @@ -246,27 +246,3 @@ function update_1278() { return UPDATE_SUCCESS; } - -function update_1278() { - Config::set('system', 'maintenance', 1); - Config::set('system', 'maintenance_reason', L10n::t('%s: Updating post-type.', DBM::date().' '.date('e'))); - - Item::update(['post-type' => Item::PT_PAGE], ['bookmark' => true]); - Item::update(['post-type' => Item::PT_PERSONAL_NOTE], ['type' => 'note']); - - Config::set('system', 'maintenance', 0); - - return UPDATE_SUCCESS; -} - -function update_1278() { - Config::set('system', 'maintenance', 1); - Config::set('system', 'maintenance_reason', L10n::t('%s: Updating post-type.', DBM::date().' '.date('e'))); - - Item::update(['post-type' => Item::PT_PAGE], ['bookmark' => true]); - Item::update(['post-type' => Item::PT_PERSONAL_NOTE], ['type' => 'note']); - - Config::set('system', 'maintenance', 0); - - return UPDATE_SUCCESS; -}