提交: a9a1ed42b14f4ce01c6cc9e666c4b740d1262bd4 - pukiwiki-fork (git)

Commit MetaInfo

• 修订版: a9a1ed42b14f4ce01c6cc9e666c4b740d1262bd4 (tree)
• 时间: 2018-06-01 05:28:27
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2473 list plugin: Sort sub pages in natural order

更改概述

• modified: lib/func.php

差异

--- a/lib/func.php
+++ b/lib/func.php
@@ -533,7 +533,7 @@ function page_list($pages, $cmd = 'read', $withfilename = FALSE)
 	} else {
 		$href = $script . '?cmd=' . $cmd . '&page=';
 	}
-
+	usort($pages, 'strnatcmp');
 	foreach($pages as $file=>$page) {
 		$r_page  = pagename_urlencode($page);
 		$s_page  = htmlsc($page, ENT_QUOTES);
@@ -568,7 +568,7 @@ function page_list($pages, $cmd = 'read', $withfilename = FALSE)
 	$cnt = 0;
 	$arr_index = array();
 	$retval .= '<ul>' . "\n";
-	foreach ($list as $head=>$pages) {
+	foreach ($list as $head=>$sub_pages) {
 		if ($head === $symbol) {
 			$head = $_msg_symbol;
 		} else if ($head === $other) {
@@ -584,8 +584,7 @@ function page_list($pages, $cmd = 'read', $withfilename = FALSE)
 				'"><strong>' . $head . '</strong></a>' . "\n" .
 				'  <ul>' . "\n";
 		}
-		ksort($pages, SORT_STRING);
-		$retval .= join("\n", $pages);
+		$retval .= join("\n", $sub_pages);
 		if ($list_index)
 			$retval .= "\n  </ul>\n </li>\n";
 	}