summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-11-30 17:08:29 +0100
committerJoas Schilling <nickvergessen@owncloud.com>2015-11-30 17:08:29 +0100
commit3c5a6b829e6966985b4c8a18e5d17d2a740d91c1 (patch)
treecfa82cf209b540b62dd5d5e6dd7dfc5c4dc7fc2b
parentb9faba8857ffb7ecd51f2be4f6619f2a6201c6a9 (diff)
downloadnextcloud-server-3c5a6b829e6966985b4c8a18e5d17d2a740d91c1.tar.gz
nextcloud-server-3c5a6b829e6966985b4c8a18e5d17d2a740d91c1.zip
Allow DI the system tag stuff without Application class
-rw-r--r--lib/private/appframework/dependencyinjection/dicontainer.php8
-rw-r--r--version.php2
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index eeab9b96e59..0c46c0bf09f 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -206,6 +206,14 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $this->getServer()->getSecureRandom();
});
+ $this->registerService('OCP\\SystemTag\\ISystemTagManager', function() {
+ return $this->getServer()->getSystemTagManager();
+ });
+
+ $this->registerService('OCP\\SystemTag\\ISystemTagObjectMapper', function() {
+ return $this->getServer()->getSystemTagObjectMapper();
+ });
+
$this->registerService('OCP\\IURLGenerator', function($c) {
return $this->getServer()->getURLGenerator();
});
diff --git a/version.php b/version.php
index 50adcf5db60..68ed5c9c217 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version = array(9, 0, 0, 3);
+$OC_Version = array(9, 0, 0, 4);
// The human readable string
$OC_VersionString = '9.0 pre alpha';