diff options
| -rw-r--r-- | core/Command/Status.php | 6 | ||||
| -rw-r--r-- | lib/base.php | 2 | ||||
| -rw-r--r-- | status.php | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/core/Command/Status.php b/core/Command/Status.php index 2f7173341b4..91c79d27670 100644 --- a/core/Command/Status.php +++ b/core/Command/Status.php @@ -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); diff --git a/lib/base.php b/lib/base.php index fe7419e6ff3..08fa229e570 100644 --- a/lib/base.php +++ b/lib/base.php @@ -264,7 +264,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 { diff --git a/status.php b/status.php index 5b4b950139b..ed7287cb317 100644 --- a/status.php +++ b/status.php @@ -43,7 +43,7 @@ try { 'maintenance' => $maintenance, 'version'=>implode('.', \OCP\Util::getVersion()), 'versionstring'=>OC_Util::getVersionString(), - 'edition'=>OC_Util::getEditionString(), + 'edition'=> $installed ? OC_Util::getEditionString() : '', 'productname'=>$defaults->getName()); if (OC::$CLI) { print_r($values); |