Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods

Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
This commit is contained in:
Thomas Tanghus 2013-09-24 00:09:21 +02:00
commit 698394c994
2 changed files with 14 additions and 0 deletions

View File

@ -62,6 +62,19 @@ interface IServerContainer {
*/ */
function getRootFolder(); function getRootFolder();
/**
* Returns a view to ownCloud's files folder
*
* @return \OCP\Files\Folder
*/
function getUserFolder();
/**
* Returns an app-specific view in ownClouds data directory
*
* @return \OCP\Files\Folder
*/
function getAppFolder();
/** /**
* Returns the user session * Returns the user session
* *

View File

@ -211,6 +211,7 @@ class Server extends SimpleContainer implements IServerContainer {
function getConfig() { function getConfig() {
return $this->query('AllConfig'); return $this->query('AllConfig');
} }
/** /**
* Returns an ICache instance * Returns an ICache instance
* *