holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Scrutinzer "bug" changing var imported not as reference into closure

Browse Source
This commit is contained in:
Ralf Becker 2016-07-10 11:58:54 +02:00
parent 0d19c8fc83
commit 0136ed2112
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/Vfs.php
View File

@ -590,10 +590,12 @@ class Vfs extends Vfs\StreamWrapper
if ($dirsontop && ($a['mime'] == self::DIR_MIME_TYPE) !== ($b['mime'] == self::DIR_MIME_TYPE))
{
$cmp = $a['mime' ] == self::DIR_MIME_TYPE ? -1 : 1;
$sort_desc = false;
}
// reverse sort for descending
if ($sort_desc) $cmp *= -1;
// reverse sort for descending, if no directory sorted to top
elseif ($sort_desc)
{
$cmp *= -1;
}
// always use name as second sort criteria
if (!$cmp) $cmp = strcasecmp($a['name'], $b['name']);
return $cmp;
@ -613,10 +615,12 @@ class Vfs extends Vfs\StreamWrapper
if ($dirsontop && ($a['mime'] == self::DIR_MIME_TYPE) !== ($b['mime'] == self::DIR_MIME_TYPE))
{
$cmp = $a['mime' ] == self::DIR_MIME_TYPE ? -1 : 1;
$sort_desc = false;
}
// reverse sort for descending
if ($sort_desc) $cmp *= -1;
elseif ($sort_desc)
{
$cmp *= -1;
}
// always use name as second sort criteria
if (!$cmp && $order != 'name') $cmp = strcasecmp($a['name'], $b['name']);
return $cmp;