Merge pull request #7355 from JeroenED/task/relationship-status2/no-dead-nodes
Changed unavailable to in a relation (Resubmit)
This commit is contained in:
commit
1f42f51351
|
@ -34,7 +34,7 @@
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
|
||||||
if (!defined('DB_UPDATE_VERSION')) {
|
if (!defined('DB_UPDATE_VERSION')) {
|
||||||
define('DB_UPDATE_VERSION', 1317);
|
define('DB_UPDATE_VERSION', 1318);
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
-- ------------------------------------------
|
-- ------------------------------------------
|
||||||
-- Friendica 2019.09-dev (Dalmatian Bellflower)
|
-- Friendica 2019.09-dev (Dalmatian Bellflower)
|
||||||
-- DB_UPDATE_VERSION 1316
|
-- DB_UPDATE_VERSION 1318
|
||||||
-- ------------------------------------------
|
-- ------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -231,8 +231,7 @@ class ContactSelector
|
||||||
'' => L10n::t('No answer'),
|
'' => L10n::t('No answer'),
|
||||||
'Single' => L10n::t('Single'),
|
'Single' => L10n::t('Single'),
|
||||||
'Lonely' => L10n::t('Lonely'),
|
'Lonely' => L10n::t('Lonely'),
|
||||||
'Available' => L10n::t('Available'),
|
'In a relation' => L10n::t('In a relation'),
|
||||||
'Unavailable' => L10n::t('Unavailable'),
|
|
||||||
'Has crush' => L10n::t('Has crush'),
|
'Has crush' => L10n::t('Has crush'),
|
||||||
'Infatuated' => L10n::t('Infatuated'),
|
'Infatuated' => L10n::t('Infatuated'),
|
||||||
'Dating' => L10n::t('Dating'),
|
'Dating' => L10n::t('Dating'),
|
||||||
|
|
10
update.php
10
update.php
|
@ -373,4 +373,14 @@ function update_1309()
|
||||||
function update_1315()
|
function update_1315()
|
||||||
{
|
{
|
||||||
DBA::delete('item-delivery-data', ['postopts' => '', 'inform' => '', 'queue_count' => 0, 'queue_done' => 0]);
|
DBA::delete('item-delivery-data', ['postopts' => '', 'inform' => '', 'queue_count' => 0, 'queue_done' => 0]);
|
||||||
|
return Update::SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_1318()
|
||||||
|
{
|
||||||
|
DBA::update('profile', ['marital' => "In a relation"], ['marital' => "Unavailable"]);
|
||||||
|
DBA::update('profile', ['marital' => "Single"], ['marital' => "Available"]);
|
||||||
|
|
||||||
|
Worker::add(PRIORITY_LOW, 'ProfileUpdate');
|
||||||
|
return Update::SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user