keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5833 from MrPetovan/develop

Browse source 
Replace remaining $a->isInstallMode() instances
This commit is contained in:
Hypolite Petovan 2018-10-05 20:32:26 -04:00 committed by GitHub
commit dc49ad090e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/daemon.php
View file

@ -34,7 +34,7 @@ require_once "include/dba.php";
$a = new App(dirname(__DIR__)); $a = new App(dirname(__DIR__));
if ($a->isInstallMode()) { if (App\Mode::isInstall()) {
die("Friendica isn't properly installed yet.\n"); die("Friendica isn't properly installed yet.\n");
} }

4
index.php
View file

@ -165,9 +165,9 @@ $_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
// in install mode, any url loads install module // in install mode, any url loads install module
// but we need "view" module for stylesheet // but we need "view" module for stylesheet
if ($a->isInstallMode() && $a->module!="view") { if (App\Mode::isInstall() && $a->module != 'view') {
$a->module = 'install'; $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'; $a->module = 'maintenance';
} else { } else {
check_url($a); check_url($a);

2
src/Core/Console/GlobalCommunityBlock.php
View file

@ -56,7 +56,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); 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'); throw new \RuntimeException('Database isn\'t ready or populated yet');
} }

2
src/Core/Console/GlobalCommunitySilence.php
View file

@ -65,7 +65,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); 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'); throw new RuntimeException('Database isn\'t ready or populated yet');
} }

2
src/Core/Console/Maintenance.php
View file

@ -64,7 +64,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); 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'); throw new \RuntimeException('Database isn\'t ready or populated yet');
} }

2
src/Core/Console/NewPassword.php
View file

@ -57,7 +57,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); 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'); throw new RuntimeException('Database isn\'t ready or populated yet');
} }

2
src/Core/Console/PostUpdate.php
View file

@ -50,7 +50,7 @@ HELP;
return 0; return 0;
} }
if ($a->isInstallMode()) { if (App\Mode::isInstall()) {
throw new \RuntimeException('Database isn\'t ready or populated yet'); throw new \RuntimeException('Database isn\'t ready or populated yet');
} }