Merge pull request #10408 from nextcloud/bugfix/noid/If_fav_fails_empty_array

MorrisJobke · web-flow · commit 03689a8d946f · 2018-07-26T16:01:28.000+02:00
Set the favorites to the empty array on failure
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -162,7 +162,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 		try {
 			$favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
 		} catch (\RuntimeException $e) {
-			$favElements['folders'] = null;
+			$favElements['folders'] = [];
 		}
 
 		$collapseClasses = '';

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal`
`162`	`162`	`try {`
`163`	`163`	`$favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());`
`164`	`164`	`} catch (\RuntimeException $e) {`
`165`		`- $favElements['folders'] = null;`
	`165`	`+ $favElements['folders'] = [];`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`$collapseClasses = '';`