Replace remaining $a->isInstallMode() instances

diff --git a/bin/daemon.php b/bin/daemon.php
index 159b20e159503f3373b9836157c9b74513f0e34f..e2bad90df59775e74ad4cd96164a84d6df41d13c 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -34,7 +34,7 @@ require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
 
-if ($a->isInstallMode()) {
+if (App\Mode::isInstall()) {
        die("Friendica isn't properly installed yet.\n");
 }
 

diff --git a/index.php b/index.php
index 2bdda90f4abf6f71fc44150e7759a1e9902a96d8..f34b79867cd42d02f7a0a7deaaa13a6a3af231d5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -165,9 +165,9 @@ $_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
 
 // in install mode, any url loads install module
 // but we need "view" module for stylesheet
-if ($a->isInstallMode() && $a->module!="view") {
+if (App\Mode::isInstall() && $a->module != 'view') {
        $a->module = 'install';
-} elseif (!App\Mode::has(App\Mode::MAINTENANCEDISABLED) && $a->module != "view") {
+} elseif (!App\Mode::has(App\Mode::MAINTENANCEDISABLED) && $a->module != 'view') {
        $a->module = 'maintenance';
 } else {
        check_url($a);

diff --git a/src/Core/Console/GlobalCommunityBlock.php b/src/Core/Console/GlobalCommunityBlock.php
index f51ed95fe2b4f49d93406317dca55d47c6e7eb3e..dbab4ff02c4dca1beeb9b0cab0690ac63d575d4a 100644 (file)
--- a/src/Core/Console/GlobalCommunityBlock.php
+++ b/src/Core/Console/GlobalCommunityBlock.php
@@ -56,7 +56,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if ($a->isInstallMode()) {
+               if (App\Mode::isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php
index 03101cdf0f3ec4da192a2436f0ec1fa74a747046..0dce00a7b176de83684b6316b7964456e6b7f9c9 100644 (file)
--- a/src/Core/Console/GlobalCommunitySilence.php
+++ b/src/Core/Console/GlobalCommunitySilence.php
@@ -65,7 +65,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if ($a->isInstallMode()) {
+               if (App\Mode::isInstall()) {
                        throw new RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/Maintenance.php b/src/Core/Console/Maintenance.php
index a3e3b80a7eb33f3feae05807a426291f4ca6f59c..d693cb6e89213641abafcbcc37cfcabecd36510e 100644 (file)
--- a/src/Core/Console/Maintenance.php
+++ b/src/Core/Console/Maintenance.php
@@ -64,7 +64,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if ($a->isInstallMode()) {
+               if (App\Mode::isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php
index 2581d81cd06cd3e2da76fdc3afffa8bbe0e05201..56f3ae7c98eb9757032b95ee88d50043e1759d3f 100644 (file)
--- a/src/Core/Console/NewPassword.php
+++ b/src/Core/Console/NewPassword.php
@@ -57,7 +57,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if ($a->isInstallMode()) {
+               if (App\Mode::isInstall()) {
                        throw new RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index 24ed514b5e46ef3c992ecf548c1388efca2123b8..a77aae39de58a7891eab17de70e31ad01d66e8ff 100644 (file)
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -50,7 +50,7 @@ HELP;
                        return 0;
                }
 
-               if ($a->isInstallMode()) {
+               if (App\Mode::isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }