Revert "Changed unavailable to in a relation"

diff --git a/config/dbstructure.config.php b/config/dbstructure.config.php
index 787a439c4c4eecb51e1bd282a9468b6f10f581c0..40fc2ef0c396673502667d516738dcc4daa8c3e5 100755 (executable)
--- 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 95da79d2f33fa7bd4481b2e0f6c66cd34511d808..7dc24b6038b3edd0028dde64cdce8192c1147e0a 100644 (file)
--- 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 2b86a6e75df663291b5f6bbd1fdaa7fac437928f..22bfe08b52a048b1bec846770df9d4b4ff51d2f1 100644 (file)
--- 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 523232ef3e972d3ce419518f80eef2bf3d3caac6..aead1b93de68455c97b93d9abbf482cb8093c2ab 100644 (file)
--- 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;
 }