6 files changed, 11 insertions, 9 deletions
diff --git a/lib/public/config.php b/lib/public/config.php
index ea3e0c1372a..65dde39cdce 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -43,7 +43,7 @@ class Config {
 	 * Gets a value from config.php
 	 * @param string $key key
 	 * @param mixed $default = null default value
-	 * @return string the value or $default
+	 * @return mixed the value or $default
 	 *
 	 * This function gets the value from config.php. If it does not exist,
 	 * $default will be returned.
diff --git a/lib/public/files/locknotacquiredexception.php b/lib/public/files/locknotacquiredexception.php
index 9fb70e7cbe2..647b07bf878 100644
--- a/lib/public/files/locknotacquiredexception.php
+++ b/lib/public/files/locknotacquiredexception.php
@@ -36,7 +36,7 @@ class LockNotAcquiredException extends \Exception {
 	public $lockType;
 
 	public function __construct($path, $lockType, $code = 0, \Exception $previous = null) {
-		$message = \OC_L10N::get('core')->t('Could not obtain lock type %d on "%s".', array($lockType, $path));
+		$message = \OC::$server->getL10N('core')->t('Could not obtain lock type %d on "%s".', array($lockType, $path));
 		parent::__construct($message, $code, $previous);
 	}
 
@@ -44,4 +44,4 @@ class LockNotAcquiredException extends \Exception {
 	public function __toString() {
 		return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
 	}
-}
-\ No newline at end of file
+}
diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index d4a8cdc7381..4865f8bc85b 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -47,7 +47,7 @@ interface IConfig {
 	 *
 	 * @param string $key the key of the value, under which it was saved
 	 * @param string $default the default value to be returned if the value isn't set
-	 * @return string the saved value
+	 * @return mixed the value or $default
 	 */
 	public function getSystemValue($key, $default = '');
 
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 9c39ac7ae73..64f5f350b1e 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -81,9 +81,10 @@ interface IServerContainer {
 	/**
 	 * Returns a view to ownCloud's files folder
 	 *
+	 * @param string $userId user ID
 	 * @return \OCP\Files\Folder
 	 */
-	function getUserFolder();
+	function getUserFolder($userId = null);
 
 	/**
 	 * Returns an app-specific view in ownClouds data directory
@@ -145,9 +146,10 @@ interface IServerContainer {
 	/**
 	 * get an L10N instance
 	 * @param string $app appid
+	 * @param string $lang
 	 * @return \OCP\IL10N
 	 */
-	function getL10N($app);
+	function getL10N($app, $lang = null);
 
 	/**
 	 * Returns the URL generator
diff --git a/lib/public/share.php b/lib/public/share.php
index bb9c6ec5886..c8b64cc187c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -265,8 +265,8 @@ class Share extends \OC\Share\Constants {
 	 *
 	 * Unsharing from self is not allowed for items inside collections
 	 */
-	public static function unshareFromSelf($itemType, $itemTarget) {
-		return \OC\Share\Share::unshareFromSelf($itemType, $itemTarget);
+	public static function unshareFromSelf($itemType, $itemOrigin, $originIsSource = false) {
+		return \OC\Share\Share::unshareFromSelf($itemType, $itemOrigin, $originIsSource);
 	}
 
 	/**
diff --git a/lib/public/util.php b/lib/public/util.php
index 83a6155685b..2f657facfe8 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -132,7 +132,7 @@ class Util {
 	 * @return \OC_L10N
 	 */
 	public static function getL10N($application, $language = null) {
-		return \OC_L10N::get($application, $language);
+		return \OC::$server->getL10N($application, $language);
 	}
 
 	/**