friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7353 from friendica/revert-7347-task/relationship-status 

Revert "Changed unavailable to in a relation"
This commit is contained in:
Hypolite Petovan 2019-07-08 16:10:55 -04:00 committed by GitHub
parent 8e2d1fad17 fe8a53425a
commit 949b5c4111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/dbstructure.config.php
View File

@ -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', 1318); define('DB_UPDATE_VERSION', 1317);
} }
return [ return [

2
database.sql
View File

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2019.09-dev (Dalmatian Bellflower) -- Friendica 2019.09-dev (Dalmatian Bellflower)
-- DB_UPDATE_VERSION 1318 -- DB_UPDATE_VERSION 1316
-- ------------------------------------------ -- ------------------------------------------

3
src/Content/ContactSelector.php
View File

@ -231,7 +231,8 @@ 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'),
'In a relation' => L10n::t('In a relation'), 'Available' => L10n::t('Available'),
'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
View File

@ -373,14 +373,4 @@ 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;
} }