page: search results as article objects

[minimedit.git] / article.inc.php

diff --git a/article.inc.php b/article.inc.php
index a9c6ce41195307f44c01d4e7d8ad6b0a67c6b686..7f8e622cde5297f5d71523a42b106a14983f09eb 100644 (file)
--- a/article.inc.php
+++ b/article.inc.php
@@ -276,12 +276,12 @@ class PageSearch
        function files()
        {
                # order alphabetically by link
-               $dir = iterator_to_array(new RecursiveIteratorIterator($this->iterator));
-               array_walk($dir, function (&$row, $name) {
-                       # prepare values for sorting (directory index first)
-                       $row = preg_replace('{/index\.html$}', '', $name);
-               });
-               asort($dir);
+               $dir = [];
+               foreach (new RecursiveIteratorIterator($this->iterator) as $name) {
+                       $article = new ArchiveArticle($name);
+                       $dir[$article->link] = $article;
+               }
+               ksort($dir);
                return $dir;
        }
 }