Commit: cef9b6740a91d30b23076e75d34760c5d5bb57c3 - pukiwiki (git)

Commit MetaInfo

• Revision: cef9b6740a91d30b23076e75d34760c5d5bb57c3 (tree)
• Time: 2014-11-26 02:39:07
• Author: henoheno <henoheno>
• Commiter: umorigu

Log Message

BugTrack2/235: Clear the sort_flag

Change Summary

• modified: lib/file.php
• modified: lib/html.php
• modified: plugin/attach.inc.php
• modified: plugin/calendar_viewer.inc.php
• modified: plugin/dump.inc.php
• modified: plugin/map.inc.php
• modified: plugin/rename.inc.php

Incremental Difference

--- a/lib/file.php
+++ b/lib/file.php
@@ -654,7 +654,7 @@ function get_readings()
 
 		if($unknownPage || $deletedPage) {
 
-			asort($readings); // Sort by pronouncing(alphabetical/reading) order
+			asort($readings, SORT_STRING); // Sort by pronouncing(alphabetical/reading) order
 			$body = '';
 			foreach ($readings as $page => $reading)
 				$body .= '-[[' . $page . ']] ' . $reading . "\n";

--- a/lib/html.php
+++ b/lib/html.php
@@ -276,9 +276,9 @@ function make_related($page, $tag = '')
 	$links = links_get_related($page);
 
 	if ($tag) {
-		ksort($links, SORT_STRING);
+		ksort($links, SORT_STRING);		// Page name, alphabetical order
 	} else {
-		arsort($links);
+		arsort($links, SORT_NUMERIC);	// Last modified date, newer
 	}
 
 	$_links = array();

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -755,7 +755,7 @@ class AttachFiles
 
 		$ret = '';
 		$files = array_keys($this->files);
-		sort($files);
+		sort($files, SORT_STRING);
 
 		foreach ($files as $file) {
 			$_files = array();

--- a/plugin/calendar_viewer.inc.php
+++ b/plugin/calendar_viewer.inc.php
@@ -149,9 +149,9 @@ function plugin_calendar_viewer_convert()
 	closedir($dir);
 
 	if ($mode == 'past') {
-		rsort($pagelist);	// New => Old
+		rsort($pagelist, SORT_STRING);	// New => Old
 	} else {
-		sort($pagelist);	// Old => New
+		sort($pagelist, SORT_STRING);	// Old => New
 	}
 
 	// Include start

--- a/plugin/dump.inc.php
+++ b/plugin/dump.inc.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: dump.inc.php,v 1.37 2006/01/12 01:01:35 teanan Exp $
+// $Id: dump.inc.php,v 1.38 2007/05/12 09:17:14 henoheno Exp $
 //
 // Remote dump / restore plugin
 // Originated as tarfile.inc.php by teanan / Interfair Laboratory 2004.
@@ -393,7 +393,7 @@ class tarlib
 		}
 		closedir($dp);
 		
-		sort($files);
+		sort($files, SORT_STRING);
 
 		$matches = array();
 		foreach($files as $name)

--- a/plugin/map.inc.php
+++ b/plugin/map.inc.php
@@ -53,7 +53,7 @@ function plugin_map_action()
 
 	if ($reverse) {
 		$keys = array_keys($nodes);
-		sort($keys);
+		sort($keys, SORT_STRING);
 		$alone = array();
 		$retval['body'] .= '<ul>' . "\n";
 		foreach ($keys as $page) {
@@ -78,7 +78,7 @@ function plugin_map_action()
 		$retval['body'] .= '<hr />' . "\n" .
 			'<p>Not related from ' . htmlsc($refer) . '</p>' . "\n";
 		$keys = array_keys($nodes);
-		sort($keys);
+		sort($keys, SORT_STRING);
 		$retval['body'] .= '<ul>' . "\n";
 		foreach ($keys as $page) {
 			if (! $nodes[$page]->done) {
@@ -142,7 +142,7 @@ class MapNode
 				$refs[] = $ref[0];
 			}
 			$this->hide($refs);
-			sort($refs);
+			sort($refs, SORT_STRING);
 		}
 		return $refs;
 	}
@@ -155,7 +155,7 @@ class MapNode
 			$data = file($file);
 			$rels = explode("\t", trim($data[0]));
 			$this->hide($rels);
-			sort($rels);
+			sort($rels, SORT_STRING);
 		}
 		return $rels;
 	}

--- a/plugin/rename.inc.php
+++ b/plugin/rename.inc.php
@@ -166,7 +166,7 @@ $msg
 EOD;
 	if (! empty($related)) {
 		$ret['body'] .= '<hr /><p>' . $_rename_messages['msg_related'] . '</p><ul>';
-		sort($related);
+		sort($related, SORT_STRING);
 		foreach ($related as $name)
 			$ret['body'] .= '<li>' . make_pagelink($name) . '</li>';
 		$ret['body'] .= '</ul>';