r1380 + readChapter(): sort words in a chapter ourselves after link rendering is...

diff --git a/inc/database.php b/inc/database.php
index 6da907dab4d4ba5f958085b6e4665637b7fa1864..1ca66f7616457a727b7eca018bff499f3eeb1ca5 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -1524,7 +1524,7 @@ function readChapter ($chapter_name = '')
        global $dbxlink;
        $query =
                "select dict_key, dict_value from Dictionary natural join Chapter " .
-               "where chapter_name = '${chapter_name}' order by dict_value";
+               "where chapter_name = '${chapter_name}'";
        $result = $dbxlink->query ($query);
        if ($result == NULL)
        {
@@ -1536,6 +1536,8 @@ function readChapter ($chapter_name = '')
        while ($row = $result->fetch (PDO::FETCH_ASSOC))
                $chapter[$row['dict_key']] = parseWikiLink ($row['dict_value'], 'o');
        $result->closeCursor();
+       // SQL ORDER BY had no sense, because we need to sort after link rendering, not before.
+       asort ($chapter);
        return $chapter;
 }