Force "Database" as default storage backend

diff --git a/static/settings.config.php b/static/settings.config.php
index e8c6d09f81eef735e58f6304b9c09c75d4b483f9..96ae421ff0e746354c9e72d2b7c004f53dc973a8 100644 (file)
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -203,4 +203,11 @@ return [
        // Used in the admin settings to lock certain features
        'featurelock' => [
        ],
+
+       // Storage backend configuration
+       'storage' => [
+               // name (String)
+               // The name of the current used backend (default is Database)
+               'name' => 'Database',
+       ],
 ];

diff --git a/update.php b/update.php
index 842fefca88f9f4bea7d24dd8e1bedfa71a40fccc..5d9c76a994a9313efcbab9e4a3bf9fa16338a231 100644 (file)
--- a/update.php
+++ b/update.php
@@ -981,3 +981,20 @@ function update_1429()
 
        return Update::SUCCESS;
 }
+
+function update_1433()
+{
+       $name = DI::config()->get('storage', 'name');
+
+       // in case of an empty config, set "Database" as default storage backend
+       if (empty($name)) {
+               DI::config()->set('storage', 'name', Storage\Database::getName());
+       }
+
+       // In case of a Using deprecated storage class value, set the right name for it
+       if (stristr($name, 'Friendica\Model\Storage\\')) {
+               DI::config()->set('storage', 'name', substr($name, 24));
+       }
+
+       return Update::SUCCESS;
+}