diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/App/CodeChecker/InfoChecker.php | 4 | ||||
| -rw-r--r-- | lib/private/Server.php | 8 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/private/App/CodeChecker/InfoChecker.php b/lib/private/App/CodeChecker/InfoChecker.php index 3ee99dc6478..77bf7e8182d 100644 --- a/lib/private/App/CodeChecker/InfoChecker.php +++ b/lib/private/App/CodeChecker/InfoChecker.php @@ -80,7 +80,7 @@ class InfoChecker extends BasicEmitter { $info = $this->infoParser->parse($appPath . '/appinfo/info.xml'); - if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && ($info['requiremin'] || $info['require'])) { + if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && (isset($info['requiremin']) || isset($info['require']))) { $this->emit('InfoChecker', 'duplicateRequirement', ['min']); $errors[] = [ 'type' => 'duplicateRequirement', @@ -90,7 +90,7 @@ class InfoChecker extends BasicEmitter { $this->emit('InfoChecker', 'missingRequirement', ['min']); } - if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && $info['requiremax']) { + if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && isset($info['requiremax'])) { $this->emit('InfoChecker', 'duplicateRequirement', ['max']); $errors[] = [ 'type' => 'duplicateRequirement', diff --git a/lib/private/Server.php b/lib/private/Server.php index 44fc605826c..eb49155adef 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1397,7 +1397,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\BackendService */ public function getStoragesBackendService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\BackendService'); + return $this->query('OCA\\Files_External\\Service\\BackendService'); } /** @@ -1406,7 +1406,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\GlobalStoragesService */ public function getGlobalStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\GlobalStoragesService'); + return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService'); } /** @@ -1415,7 +1415,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\UserGlobalStoragesService */ public function getUserGlobalStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserGlobalStoragesService'); + return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService'); } /** @@ -1424,7 +1424,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\UserStoragesService */ public function getUserStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService'); + return $this->query('OCA\\Files_External\\Service\\UserStoragesService'); } /** diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 9e3bbf88470..7e5c120717f 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -153,6 +153,7 @@ class TemplateLayout extends \OC_Template { $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); $this->assign('cssfiles', array()); $this->assign('printcssfiles', []); + $this->assign('versionHash', self::$versionHash); foreach($cssFiles as $info) { $web = $info[1]; $file = $info[2]; |