Commit: 3982177cb4734d77c8e5bcae20f3739424f041f2 - pukiwiki (git)

Commit MetaInfo

• Revision: 3982177cb4734d77c8e5bcae20f3739424f041f2 (tree)
• Time: 2014-11-26 02:27:34
• Author: henoheno <henoheno>
• Commiter: umorigu

Log Message

BugTrack2/235: Clear the sort_flag: ksort()

Change Summary

• modified: lib/func.php
• modified: lib/html.php
• modified: plugin/attach.inc.php
• modified: plugin/related.inc.php
• modified: plugin/rename.inc.php
• modified: plugin/versionlist.inc.php

Incremental Difference

--- a/lib/func.php
+++ b/lib/func.php
@@ -388,7 +388,7 @@ function page_list($pages, $cmd = 'read', $withfilename = FALSE)
 
 		$list[$head][$page] = $str;
 	}
-	ksort($list);
+	ksort($list, SORT_STRING);
 
 	$cnt = 0;
 	$arr_index = array();
@@ -409,7 +409,7 @@ function page_list($pages, $cmd = 'read', $withfilename = FALSE)
 				'"><strong>' . $head . '</strong></a>' . "\n" .
 				'  <ul>' . "\n";
 		}
-		ksort($pages);
+		ksort($pages, SORT_STRING);
 		$retval .= join("\n", $pages);
 		if ($list_index)
 			$retval .= "\n  </ul>\n </li>\n";

--- a/lib/html.php
+++ b/lib/html.php
@@ -187,7 +187,7 @@ function edit_form($page, $postdata, $digest = FALSE, $b_template = TRUE)
 			$pages[$_page] = '   <option value="' . $s_page . '">' .
 				$s_page . '</option>';
 		}
-		ksort($pages);
+		ksort($pages, SORT_STRING);
 		$s_pages  = join("\n", $pages);
 		$template = <<<EOD
   <select name="template_page">
@@ -276,7 +276,7 @@ function make_related($page, $tag = '')
 	$links = links_get_related($page);
 
 	if ($tag) {
-		ksort($links);
+		ksort($links, SORT_STRING);
 	} else {
 		arsort($links);
 	}

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -27,7 +27,7 @@ define('PLUGIN_ATTACH_DELETE_ADMIN_ONLY', TRUE); // FALSE or TRUE
 
 // 管理者が添付ファイルを削除するときは、バックアップを作らない
 // PLUGIN_ATTACH_DELETE_ADMIN_ONLY=TRUEのとき有効
-define('PLUGIN_ATTACH_DELETE_ADMIN_NOBACKUP', TRUE); // FALSE or TRUE
+define('PLUGIN_ATTACH_DELETE_ADMIN_NOBACKUP', FALSE); // FALSE or TRUE
 
 // アップロード/削除時にパスワードを要求する(ADMIN_ONLYが優先)
 define('PLUGIN_ATTACH_PASSWORD_REQUIRE', FALSE); // FALSE or TRUE
@@ -765,7 +765,7 @@ class AttachFiles
 			if (! isset($_files[0])) {
 				$_files[0] = htmlsc($file);
 			}
-			ksort($_files);
+			ksort($_files, SORT_NUMERIC);
 			$_file = $_files[0];
 			unset($_files[0]);
 			$ret .= " <li>$_file\n";
@@ -840,7 +840,7 @@ class AttachPages
 		$ret = '';
 
 		$pages = array_keys($this->pages);
-		sort($pages);
+		sort($pages, SORT_STRING);
 
 		foreach ($pages as $page) {
 			if (check_non_list($page)) continue;

--- a/plugin/related.inc.php
+++ b/plugin/related.inc.php
@@ -42,7 +42,7 @@ function plugin_related_action()
 		$retval .= '<ul><li>No related pages found.</li></ul>' . "\n";	
 	} else {
 		// Show count($data)?
-		ksort($data);
+		ksort($data, SORT_STRING);
 		$retval .= '<ul>' . "\n";
 		foreach ($data as $page=>$time) {
 			$r_page  = rawurlencode($page);

--- a/plugin/rename.inc.php
+++ b/plugin/rename.inc.php
@@ -286,7 +286,7 @@ function plugin_rename_phase3($pages)
 <p>{$_rename_messages['msg_confirm']}</p>
 EOD;
 
-	ksort($pages);
+	ksort($pages, SORT_STRING);
 	$ret['body'] .= '<ul>' . "\n";
 	foreach ($pages as $old=>$new)
 		$ret['body'] .= '<li>' .  make_pagelink(decode($old)) .
@@ -413,7 +413,7 @@ function plugin_rename_getselecttag($page)
 		$pages[$_page] = '<option value="' . $s_page . '"' . $selected . '>' .
 			$s_page . '</option>';
 	}
-	ksort($pages);
+	ksort($pages, SORT_STRING);
 	$list = join("\n" . ' ', $pages);
 
 	return <<<EOD

--- a/plugin/versionlist.inc.php
+++ b/plugin/versionlist.inc.php
@@ -1,11 +1,12 @@
 <?php
-// $Id: versionlist.inc.php,v 1.15 2005/01/29 02:12:52 henoheno Exp $
-/*
- * PukiWiki versionlist plugin
- *
- * CopyRight 2002 S.YOSHIMURA GPL2
- * http://masui.net/pukiwiki/ [e-mail]
- */
+// PukiWiki - Yet another WikiWikiWeb clone
+// $Id: versionlist.inc.php,v 1.17 2007/05/12 08:37:38 henoheno Exp $
+// Copyright (C)
+//	 2002-2006 PukiWiki Developers Team
+//	 2002      S.YOSHIMURA GPL2 [e-mail]
+// License: GPL v2
+//
+// Listing cvs revisions of files
 
 function plugin_versionlist_action()
 {
@@ -59,7 +60,7 @@ function plugin_versionlist_convert()
 	{
 		return '';
 	}
-	ksort($comments);
+	ksort($comments, SORT_STRING);
 	$retval = '';
 	foreach ($comments as $comment)
 	{