Merge branch 'master' into fixing-3942-master

Conflicts:
	apps/files/ajax/upload.php

2 files changed, 15 insertions, 1 deletions

diff --git a/lib/config.php b/lib/config.php
index fcd0a9d7c3c..f1c139f22b1 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -132,6 +132,9 @@ class OC_Config{
 
 		// read all file in config dir ending by config.php
 		$config_files = glob( OC::$SERVERROOT."/config/*.config.php");
+		if (!is_array($config_files)) {
+			$config_files = array();
+		}
 
 		//Filter only regular files
 		$config_files = array_filter($config_files, 'is_file');
diff --git a/lib/public/share.php b/lib/public/share.php
index 69e6f35b473..468026d3d92 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -335,12 +335,23 @@ class Share {
 	* @return Return depends on format
 	*/
 	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
-		$parameters = null, $includeCollections = false) {
+	                                     $parameters = null, $includeCollections = false) {
 		return self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), $format,
 			$parameters, -1, $includeCollections);
 	}
 
 	/**
+	 * @param $itemType
+	 * @param $itemSource
+	 * @param $uid_owner
+	 * @return mixed
+	 */
+	public static function getSharedItem($itemType, $itemSource, $uid_owner) {
+		return self::getItems($itemType, $itemSource, null, null, $uid_owner, self::FORMAT_NONE,
+			null, 1, false);
+	}
+
+	/**
 	* Get all users an item is shared with
 	* @param string Item type
 	* @param string Item source