1 files changed, 10 insertions, 1 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index ec36aab75d9..f1c6b460a92 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -53,6 +53,7 @@ use OCP\Federation\ICloudIdManager;
 use OCP\Files\IAppData;
 use OCP\Files\Mount\IMountManager;
 use OCP\RichObjectStrings\IValidator;
+use OCP\Util;
 
 class DIContainer extends SimpleContainer implements IAppContainer {
 
@@ -339,6 +340,14 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $c->query('ServerContainer')->getWebRoot();
 		});
 
+		$this->registerService('fromMailAddress', function() {
+			return Util::getDefaultEmailAddress('no-reply');
+		});
+
+		$this->registerService('OC_Defaults', function ($c) {
+			return $c->getServer()->getThemingDefaults();
+		});
+
 		$this->registerService('OCP\Encryption\IManager', function ($c) {
 			return $this->getServer()->getEncryptionManager();
 		});
@@ -505,7 +514,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 	 * @return boolean
 	 */
 	function isLoggedIn() {
-		return \OC_User::isLoggedIn();
+		return \OC::$server->getUserSession()->isLoggedIn();
 	}
 
 	/**