From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 18 Sep 2013 11:20:07 +0000 (+0200)
Subject: Merge branch 'appframework-master' into public_cache
X-Git-Tag: v6.0.0alpha2~121^2~14^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dd62ccdb4eb595bc76d9f55373eb2a49ea0f0686;p=nextcloud-server.git

Merge branch 'appframework-master' into public_cache

Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
---

dd62ccdb4eb595bc76d9f55373eb2a49ea0f0686
diff --cc lib/public/iservercontainer.php
index 1087c24edc0,ec7212b306e..1725b7c74e0
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@@ -62,11 -62,11 +62,18 @@@ interface IServerContainer 
  	 */
  	function getRootFolder();
  
 +	/**
 +	 * Returns an ICache instance
 +	 *
 +	 * @return \OCP\ICache
 +	 */
 +	function getCache();
 +
+ 	/**
+ 	 * Returns the current session
+ 	 *
+ 	 * @return \OCP\ISession
+ 	 */
+ 	function getSession();
+ 
  }
diff --cc lib/server.php
index f02b2bed8de,0eee3e0f73a..f4dc22a2be4
--- a/lib/server.php
+++ b/lib/server.php
@@@ -98,13 -97,13 +97,22 @@@ class Server extends SimpleContainer im
  		return $this->query('RootFolder');
  	}
  
 +	/**
 +	 * Returns an ICache instance
 +	 *
 +	 * @return \OCP\ICache
 +	 */
 +	function getCache() {
 +		return $this->query('UserCache');
 +	}
 +
+ 	/**
+ 	 * Returns the current session
+ 	 *
+ 	 * @return \OCP\ISession
+ 	 */
+ 	function getSession() {
+ 		return \OC::$session;
+ 	}
+ 
  }