fix sorting media paths

docs/NEWS

@@ -3,6 +3,8 @@
 Version 1.1-alpha7()
 ------------------------------------------------------------------------
 
+    * Properly sort media directories (garvinhicking)
+
     * Better use of "return by references" in some vital areas.
       Improves performance. Might introduce glitches. Keep an eye on this!
       (garvinhicking)

include/functions_images.inc.php

@@ -1380,7 +1380,9 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
 		}
 		unset($aResultSet[$sKey]);
 	}
-	//sort($paths);
+
+    usort($paths, 'serendipity_sortPath');
+
 	if ($debug) echo "<p>Got files: <pre>" . print_r($aFilesOnDisk, true) . "</pre></p>";
 	$serendipity['current_image_hash'] = md5(serialize($aFilesOnDisk));
 
@@ -1714,6 +1716,18 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs = true, $pattern
     return $files;
 }
 
+/**
+ * Custom usort() function that properly sorts a path
+ *
+ * @access public
+ * @param   array      First array
+ * @param   array      Second array
+ * @return
+ */
+function serendipity_sortPath($a, $b) {
+    return strcasecmp($a['relpath'], $b['relpath']);
+}
+
 /**
  * Delete a directory with all its files
  *
@@ -3264,5 +3278,8 @@ function &serendipity_getMediaPaths() {
 		unset($aResultSet[$sKey]);
 	}
     serendipity_directoryACL($paths, 'read');
+
+    usort($paths, 'serendipity_sortPath');
+
     return $paths;
 }