wait #5020 @0.5

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 213f65ca09ab6961927ca0c34033b0ffecff34e3..d0c46bdda6e9176b5a9b23fd2d673df4f4efabc4 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -30,7 +30,7 @@ class wsHTML5Compiler
             'js/libs/jquery/jquery.mousewheel.min.js',
             'js/libs/jquery/jquery.hashchange.min.js',
             'js/libs/jquery/jquery.scrollto.min.js',
-            ],
+        ],
         'aria' => ['js/libs/aria/radio.js',],
         'bluebird' => ['js/libs/bluebird.min.js'],
         'screenfull' => ['js/libs/screenfull.min.js'],
@@ -3474,6 +3474,19 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         $list = $this->config->articlesList ?? [];
 
         $nb = count($list);
+
+        usort($list, function ($a, $b) {
+            if ($a['page'] == $b['page']) {
+                $ea = explode('-', $a['id']);
+                $eb = explode('-', $b['id']);
+                if (is_numeric($ea[0]) && is_numeric($eb[0])) {
+                    return $ea[0] - $eb[0];
+                }
+                return strcmp($a['id'], $b['id']);
+            }
+            return $a['page'] - $b['page'];
+        });
+
         foreach ($list as $k => $item) {
             $nextIndex = ($k + 1) % $nb;
             $prevIndex = ($k - 1 + $nb) % $nb;