Merge branch 'media-revisions'

This introduces a new media manager and media revisions to DokuWiki. The
changes have been implemented by Kate Arzamastseva and are the
result of a Google Summer of Code project, the official project page can
be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/kate/18001

Thanks to Kate for the work and Google for sponsoring it!

1 files changed, 8 insertions, 2 deletions

diff --git a/inc/search.php b/inc/search.php
index bc7c35482..a26ae4808 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -21,9 +21,10 @@ if(!defined('DOKU_INC')) die('meh.');
  * @param   int       $lvl  Recursion Level
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
+function search(&$data,$base,$func,$opts,$dir='',$lvl=1,$sort=false){
     $dirs   = array();
     $files  = array();
+    $filepaths = array();
 
     //read in directories and files
     $dh = @opendir($base.'/'.$dir);
@@ -35,9 +36,14 @@ function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
             continue;
         }
         $files[] = $dir.'/'.$file;
+        $filepaths[] = $base.'/'.$dir.'/'.$file;
     }
     closedir($dh);
-    sort($files);
+    if ($sort == 'date') {
+        @array_multisort(array_map('filemtime', $filepaths), SORT_NUMERIC, SORT_DESC, $files);
+    } else {
+        sort($files);
+    }
     sort($dirs);
 
     //give directories to userfunction then recurse