bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5016 from annando/fix-blocked

Browse source 
Corrects falsely blocked contacts because of some bug in the develop branch
This commit is contained in:
Hypolite Petovan 2018-05-10 08:18:04 -04:00 committed by GitHub
commit 86ac44bd4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily'); define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.05-rc'); define('FRIENDICA_VERSION', '2018.05-rc');
define('DFRN_PROTOCOL_VERSION', '2.23'); define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1260); define('DB_UPDATE_VERSION', 1261);
define('NEW_UPDATE_ROUTINE_VERSION', 1170); define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/** /**

6
update.php
View file

@ -227,3 +227,9 @@ function update_1260() {
Config::set('system', 'maintenance', 0); Config::set('system', 'maintenance', 0);
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
} }
function update_1261() {
// This fixes the results of an issue in the develop branch of 2018-05.
dba::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]);
return UPDATE_SUCCESS;
}