From fe8a53425a4de1dcf318b524541fd0df5c6b217e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 8 Jul 2019 15:55:08 -0400 Subject: [PATCH] Revert "Changed unavailable to in a relation" --- config/dbstructure.config.php | 2 +- database.sql | 2 +- src/Content/ContactSelector.php | 3 ++- update.php | 10 ---------- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/config/dbstructure.config.php b/config/dbstructure.config.php index 787a439c4c..40fc2ef0c3 100755 --- a/config/dbstructure.config.php +++ b/config/dbstructure.config.php @@ -34,7 +34,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1318); + define('DB_UPDATE_VERSION', 1317); } return [ diff --git a/database.sql b/database.sql index 95da79d2f3..7dc24b6038 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2019.09-dev (Dalmatian Bellflower) --- DB_UPDATE_VERSION 1318 +-- DB_UPDATE_VERSION 1316 -- ------------------------------------------ diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 2b86a6e75d..22bfe08b52 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -231,7 +231,8 @@ class ContactSelector '' => L10n::t('No answer'), 'Single' => L10n::t('Single'), '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'), 'Infatuated' => L10n::t('Infatuated'), 'Dating' => L10n::t('Dating'), diff --git a/update.php b/update.php index 523232ef3e..aead1b93de 100644 --- a/update.php +++ b/update.php @@ -373,14 +373,4 @@ function update_1309() function update_1315() { 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; } -- 2.39.5