From 0136ed21125f354f303285d34132c05edebc9927 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Sun, 10 Jul 2016 11:58:54 +0200
Subject: [PATCH] fix Scrutinzer "bug" changing var imported not as reference
 into closure

---
 api/src/Vfs.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/src/Vfs.php b/api/src/Vfs.php
index 9b620071c3..492c1d9964 100644
--- a/api/src/Vfs.php
+++ b/api/src/Vfs.php
@@ -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;