clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5833 from MrPetovan/develop 

Replace remaining $a->isInstallMode() instances
This commit is contained in:
Hypolite Petovan 2018-10-05 20:32:26 -04:00 committed by GitHub
parent 3564daf24d 3ed9e7fe1d
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__));
if ($a->isInstallMode()) {
if (App\Mode::isInstall()) {
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
// 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);

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

@ -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');
}

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

@ -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');
}

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

@ -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');
}

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

@ -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');
}

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

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