Merge pull request #64 from chesio/fix-return-value

Always return an array from AIOWPSecurity_Utility_File::scan_dir_sort_date()
Arsenal21 · Nov 16, 2016 · c173668 · c173668
2 parents f5c1fbc + 7f9e629
commit c173668
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/all-in-one-wp-security/classes/wp-security-utility-file.php b/all-in-one-wp-security/classes/wp-security-utility-file.php
@@ -417,24 +417,24 @@ static function get_attachment_id_from_url($attachment_url = '')
 
     /**
      * Will return an indexed array of files sorted by last modified timestamp
-     * @param $dir
+     * @param string $dir
      * @param string $sort (ASC, DESC)
-     * @return array|bool
+     * @return array
      */
     static function scan_dir_sort_date($dir, $sort='DESC') {
         $files = array();
         foreach (scandir($dir) as $file) {
             $files[$file] = filemtime($dir . '/' . $file);
         }
 
-        arsort($files);
-        $files = array_keys($files);
-        if($sort == 'ASC'){
-            $files = array_reverse($files);
+        if ($sort === 'ASC') {
+            asort($files);
+        }
+        else {
+            arsort($files);
         }
-        return ($files) ? $files : false;
-    }
-
 
+        return array_keys($files);
+    }
 
 }