From 7e92b52974371bae4f69b74d26e3886f45102e39 Mon Sep 17 00:00:00 2001 From: Michael Weimann Date: Fri, 14 Sep 2018 22:06:56 +0200 Subject: Fixes empty favorite names for trailing slashes Signed-off-by: Michael Weimann --- apps/files/lib/Controller/ViewController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'apps/files/lib/Controller') diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 0655718f8c1..d91d3b9db4c 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -176,7 +176,6 @@ class ViewController extends Controller { $currentCount = 0; foreach ($favElements['folders'] as $dir) { - $id = substr($dir, strrpos($dir, '/') + 1, strlen($dir)); $link = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']); $sortingValue = ++$currentCount; $element = [ @@ -186,7 +185,7 @@ class ViewController extends Controller { 'dir' => $dir, 'order' => $navBarPositionPosition, 'folderPosition' => $sortingValue, - 'name' => $id, + 'name' => basename($dir), 'icon' => 'files', 'quickaccesselement' => 'true' ]; -- cgit v1.2.3