clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Trying to clean up a little bit more (#5517) 

* "post-type" replaces "bookmark" and "type"

* The permission set is now removed upon expiry

* Post update now stores the permission set

* We don't store the permissions in the item table anymore

* Postupdate now handles "postopts" as well

* "post-type" replaces "bookmark" and "type"

* "post-type" replaces "bookmark" and "type"

* "post-type" replaces "bookmark" and "type"

* The permission set is now removed upon expiry

* The permission set is now removed upon expiry

* We don't store the permissions in the item table anymore

* Postupdate now handles "postopts" as well

* Multiplicated update functions

* And some more duplicated functions ...

* Removed duplicate functions
This commit is contained in:
Michael Vogel 2018-07-28 22:04:56 +02:00 committed by Hypolite Petovan
parent 91db91d315
commit 489d3daa94
3 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Database/PostUpdate.php
View File

@ -8,6 +8,7 @@ use Friendica\Core\Config;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\PermissionSet; use Friendica\Model\PermissionSet;
use Friendica\Database\DBA;
require_once 'include/dba.php'; require_once 'include/dba.php';

5
src/Worker/Expire.php
View File

@ -43,11 +43,6 @@ class Expire
if (!empty($row['psid']) && !DBA::exists('item', ['psid' => $row['psid']])) { if (!empty($row['psid']) && !DBA::exists('item', ['psid' => $row['psid']])) {
DBA::delete('permissionset', ['id' => $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); DBA::close($rows);

24
update.php
View File

@ -246,27 +246,3 @@ function update_1278() {
return UPDATE_SUCCESS; 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;
}