Merge pull request #287 from owncloud/fix-warning

blizzz · web-flow · commit 8a04a7bbffae · 2016-08-27T01:28:41.000+02:00
fix undefined offset warning
diff --git a/controller/rest/publiccontroller.php b/controller/rest/publiccontroller.php
@@ -43,8 +43,12 @@ public function returnAsJson($user, $password = null, $tags = array(), $conjunct
 			return $this->newJsonErrorMessage("User could not be identified");
 		}
 
-		if ($tags[0] == "") {
-			$tags = array();
+		if (!is_array($tags)) {
+			if(is_string($tags) && $tags !== '') {
+				$tags = [ $tags ];
+			} else {
+				$tags = array();
+			}
 		}
 
 		$public = true;

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,12 @@ public function returnAsJson($user, $password = null, $tags = array(), $conjunct`
`43`	`43`	`return $this->newJsonErrorMessage("User could not be identified");`
`44`	`44`	`}`
`45`	`45`
`46`		`- if ($tags[0] == "") {`
`47`		`- $tags = array();`
	`46`	`+ if (!is_array($tags)) {`
	`47`	`+ if(is_string($tags) && $tags !== '') {`
	`48`	`+ $tags = [ $tags ];`
	`49`	`+ } else {`
	`50`	`+ $tags = array();`
	`51`	`+ }`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`$public = true;`