Merge branch 'master' into pr-exceed_upload_limit_msg

Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php

1 files changed, 12 insertions, 3 deletions

diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index da6b6c54843..1d0f8e0015c 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -36,6 +36,7 @@ namespace OCP;
 interface IConfig {
 	/**
 	 * Sets a new system wide value
+	 *
 	 * @param string $key the key of the value, under which will be saved
 	 * @param string $value the value that should be stored
 	 * @todo need a use case for this
@@ -44,14 +45,17 @@ interface IConfig {
 
 	/**
 	 * Looks up a system wide defined value
+	 *
 	 * @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
 	 */
-	public function getSystemValue($key);
+	public function getSystemValue($key, $default = '');
 
 
 	/**
 	 * Writes a new app wide value
+	 *
 	 * @param string $appName the appName that we want to store the value under
 	 * @param string $key the key of the value, under which will be saved
 	 * @param string $value the value that should be stored
@@ -60,15 +64,18 @@ interface IConfig {
 
 	/**
 	 * Looks up an app wide defined value
+	 *
 	 * @param string $appName the appName that we stored the value under
 	 * @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
 	 */
-	public function getAppValue($appName, $key);
+	public function getAppValue($appName, $key, $default = '');
 
 
 	/**
 	 * Set a user defined value
+	 *
 	 * @param string $userId the userId of the user that we want to store the value under
 	 * @param string $appName the appName that we want to store the value under
 	 * @param string $key the key under which the value is being stored
@@ -78,9 +85,11 @@ interface IConfig {
 
 	/**
 	 * Shortcut for getting a user defined value
+	 *
 	 * @param string $userId the userId of the user that we want to store the value under
 	 * @param string $appName the appName that we stored the value under
 	 * @param string $key the key under which the value is being stored
+	 * @param string $default the default value to be returned if the value isn't set
 	 */
-	public function getUserValue($userId, $appName, $key);
+	public function getUserValue($userId, $appName, $key, $default = '');
 }