diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-09-06 14:11:30 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2016-09-06 16:05:28 +0200 |
| commit | 7c0951244a176e0b42d2d66a4288d74460821a8c (patch) | |
| tree | 3324f36c7f0f7b5a8a85cc8f3ab910af46b3b2f8 /core | |
| parent | 836c938583a2709adb21cdaafb3f000e8c77a086 (diff) | |
| download | nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.tar.gz nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.zip | |
Deprecate getEditionString()
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/Status.php | 6 | ||||
| -rw-r--r-- | core/Controller/OCSController.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/core/Command/Status.php b/core/Command/Status.php index 91c79d27670..177c63f0405 100644 --- a/core/Command/Status.php +++ b/core/Command/Status.php @@ -38,13 +38,11 @@ class Status extends Base { } protected function execute(InputInterface $input, OutputInterface $output) { - $installed = (bool) \OC::$server->getConfig()->getSystemValue('installed', false); - $values = array( - 'installed' => $installed, + 'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false), 'version' => implode('.', \OCP\Util::getVersion()), 'versionstring' => \OC_Util::getVersionString(), - 'edition' => $installed ? \OC_Util::getEditionString() : '', + 'edition' => '', ); $this->writeArrayInOutputFormat($input, $output, $values); diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php index c785f1ff94a..13cc4d8ce2c 100644 --- a/core/Controller/OCSController.php +++ b/core/Controller/OCSController.php @@ -81,7 +81,7 @@ class OCSController extends \OCP\AppFramework\OCSController { 'minor' => $minor, 'micro' => $micro, 'string' => \OC_Util::getVersionString(), - 'edition' => \OC_Util::getEditionString(), + 'edition' => '', ); $result['capabilities'] = $this->capabilitiesManager->getCapabilities(); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b5466b6fc05..6b9cd4061ed 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -48,13 +48,7 @@ <a href="#" class="header-appname-container menutoggle" tabindex="2"> <h1 class="header-appname"> - <?php - if(OC_Util::getEditionString() === '') { - p(!empty($_['application'])?$_['application']: $l->t('Apps')); - } else { - print_unescaped($theme->getHTMLName()); - } - ?> + <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?> </h1> <div class="icon-caret"></div> </a> |