mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1289 from nextcloud/backport-1284-allow-status.php-before-install-9 

[stable9] Allow to call status.php before the instance is installed
This commit is contained in:
Roeland Jago Douma 2016-09-07 16:29:04 +02:00 committed by GitHub
parent b627ecac92 930fd6fb56
commit afc928d133
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/command/status.php
View File

@ -38,11 +38,13 @@ class Status extends Base {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$installed = (bool) \OC::$server->getConfig()->getSystemValue('installed', false);
$values = array(
'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
'installed' => $installed,
'version' => implode('.', \OCP\Util::getVersion()),
'versionstring' => \OC_Util::getVersionString(),
'edition' => \OC_Util::getEditionString(),
'edition' => $installed ? \OC_Util::getEditionString() : '',
);
$this->writeArrayInOutputFormat($input, $output, $values);

2
lib/base.php
View File

@ -287,7 +287,7 @@ class OC {
return;
}
// Redirect to installer if not installed
if (!\OC::$server->getSystemConfig()->getValue('installed', false) && OC::$SUBURI != '/index.php') {
if (!\OC::$server->getSystemConfig()->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
if (OC::$CLI) {
throw new Exception('Not installed');
} else {

2
status.php
View File

@ -40,7 +40,7 @@ try {
'maintenance' => $maintenance,
'version'=>implode('.', \OCP\Util::getVersion()),
'versionstring'=>OC_Util::getVersionString(),
'edition'=>OC_Util::getEditionString());
'edition'=> $installed ? OC_Util::getEditionString() : '');
if (OC::$CLI) {
print_r($values);
} else {