Merge pull request #20845 from owncloud/allow-di-in-apps

Allow DI the system tag stuff without Application class

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';