提交: 2a9257ba23e5eabd369ea57f22835a31fb7c2125 - pukiwiki_auth (git)

Commit MetaInfo

• 修訂: 2a9257ba23e5eabd369ea57f22835a31fb7c2125 (tree)
• 時間: 2007-10-06 22:20:59
• 作者: henoheno <henoheno>
• Commiter: henoheno

Log Message

BugTrack2/236: If you compare two numerical strings, they are compared as integers

Change Summary

• modified: lib/file.php
• modified: lib/link.php
• modified: lib/make_link.php
• modified: plugin/edit.inc.php
• modified: plugin/include.inc.php
• modified: plugin/menu.inc.php
• modified: plugin/navi.inc.php
• modified: plugin/popular.inc.php
• modified: plugin/rename.inc.php

差異

--- a/lib/file.php
+++ b/lib/file.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: file.php,v 1.87 2007/09/23 04:23:40 henoheno Exp $
+// $Id: file.php,v 1.88 2007/10/06 13:20:48 henoheno Exp $
 // Copyright (C)
 //   2002-2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -103,7 +103,7 @@ function page_write($page, $postdata, $notimestamp = FALSE)
 	links_update($page);
 
 	// Update autoalias.dat (AutoAliasName)
-	if ($autoalias && $page == $aliaspage) {
+	if ($autoalias && $page === $aliaspage) {
 		$aliases = get_autoaliases();
 		if (empty($aliases)) {
 			// Remove
@@ -434,7 +434,7 @@ function put_lastmodified()
 	// Check ALL filetime
 	$recent_pages = array();
 	foreach($pages as $page)
-		if ($page != $whatsnew && ! check_non_list($page))
+		if ($page !== $whatsnew && ! check_non_list($page))
 			$recent_pages[$page] = get_filetime($page);
 
 	// Sort decending order of last-modification date
@@ -735,7 +735,7 @@ function links_get_related($page)
 	if (isset($links[$page])) return $links[$page];
 
 	// If possible, merge related pages generated by make_link()
-	$links[$page] = ($page == $vars['page']) ? $related : array();
+	$links[$page] = ($page === $vars['page']) ? $related : array();
 
 	// Get repated pages from DB
 	$links[$page] += links_get_related_db($vars['page']);

--- a/lib/link.php
+++ b/lib/link.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: link.php,v 1.16 2007/07/28 17:13:30 henoheno Exp $
+// $Id: link.php,v 1.17 2007/10/06 13:20:48 henoheno Exp $
 // Copyright (C) 2003-2006, 2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -67,7 +67,7 @@ function links_update($page)
 	$links    = links_get_objects($page, TRUE);
 	foreach ($links as $_obj) {
 		if (! isset($_obj->type) || $_obj->type != 'pagename' ||
-		    $_obj->name == $page || $_obj->name == '')
+		    $_obj->name === $page || $_obj->name == '')
 			continue;
 
 		if (is_a($_obj, 'Link_autolink')) { // 行儀が悪い
@@ -114,7 +114,7 @@ function links_update($page)
 		$search_non_list = 1;
 		$pages           = do_search($page, 'AND', TRUE);
 		foreach ($pages as $_page) {
-			if ($_page != $page)
+			if ($_page !== $page)
 				links_update($_page);
 		}
 	}
@@ -203,7 +203,7 @@ function links_add($page, $add, $rel_auto)
 			foreach (file($ref_file) as $line) {
 				list($ref_page, $ref_auto) = explode("\t", rtrim($line));
 				if (! $ref_auto) $all_auto = FALSE;
-				if ($ref_page != $page) $ref .= $line;
+				if ($ref_page !== $page) $ref .= $line;
 			}
 			unlink($ref_file);
 		}
@@ -230,7 +230,7 @@ function links_delete($page, $del)
 		$ref = '';
 		foreach (file($ref_file) as $line) {
 			list($ref_page, $ref_auto) = explode("\t", rtrim($line));
-			if ($ref_page != $page) {
+			if ($ref_page !== $page) {
 				if (! $ref_auto) $all_auto = FALSE;
 				$ref .= $line;
 			}

--- a/lib/make_link.php
+++ b/lib/make_link.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: make_link.php,v 1.35 2006/09/30 02:10:50 henoheno Exp $
+// $Id: make_link.php,v 1.36 2007/10/06 13:20:48 henoheno Exp $
 // Copyright (C)
-//   2003-2005 PukiWiki Developers Team
+//   2003-2005, 2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -784,7 +784,7 @@ function make_pagelink($page, $alias = '', $anchor = '', $refer = '', $isautolin
 	$r_page  = rawurlencode($page);
 	$r_refer = ($refer == '') ? '' : '&amp;refer=' . rawurlencode($refer);
 
-	if (! isset($related[$page]) && $page != $vars['page'] && is_page($page))
+	if (! isset($related[$page]) && $page !== $vars['page'] && is_page($page))
 		$related[$page] = get_filetime($page);
 
 	if ($isautolink || is_page($page)) {

--- a/plugin/edit.inc.php
+++ b/plugin/edit.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: edit.inc.php,v 1.45 2007/08/19 14:20:58 henoheno Exp $
+// $Id: edit.inc.php,v 1.46 2007/10/06 13:20:59 henoheno Exp $
 // Copyright (C) 2001-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -93,7 +93,7 @@ function plugin_edit_inline()
 	$s_label = strip_htmltag(array_pop($args), FALSE);
 
 	$page    = array_shift($args);
-	if ($page == NULL) $page = '';
+	if ($page === NULL) $page = '';
 	$_noicon = $_nolabel = FALSE;
 	foreach($args as $arg){
 		switch(strtolower($arg)){

--- a/plugin/include.inc.php
+++ b/plugin/include.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: include.inc.php,v 1.21 2004/12/30 13:26:43 henoheno Exp $
+// $Id: include.inc.php,v 1.22 2007/10/06 13:20:59 henoheno Exp $
 //
 // Include-once plugin
 
@@ -108,7 +108,7 @@ function plugin_include_convert()
 	if ($with_title) {
 		$link = '<a href="' . $script . '?cmd=edit&amp;page=' . $r_page .
 			'">' . $s_page . '</a>';
-		if ($page == $menubar) {
+		if ($page === $menubar) {
 			$body = '<span align="center"><h5 class="side_label">' .
 				$link . '</h5></span><small>' . $body . '</small>';
 		} else {

--- a/plugin/menu.inc.php
+++ b/plugin/menu.inc.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: menu.inc.php,v 1.8 2004/11/27 12:23:02 henoheno Exp $
+// $Id: menu.inc.php,v 1.9 2007/10/06 13:20:59 henoheno Exp $
 //
 
 // サブメニューを使用する
@@ -47,7 +47,7 @@ function plugin_menu_convert()
 
 		if (! is_page($page)) {
 			return '';
-		} else if ($vars['page'] == $page) {
+		} else if ($vars['page'] === $page) {
 			return '<!-- #menu(): You already view ' . htmlspecialchars($page) . ' -->';
 		} else {
 			// Cut fixed anchors

--- a/plugin/navi.inc.php
+++ b/plugin/navi.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: navi.inc.php,v 1.22 2005/04/02 06:33:39 henoheno Exp $
+// $Id: navi.inc.php,v 1.23 2007/10/06 13:20:59 henoheno Exp $
 //
 // Navi plugin: Show DocBook-like navigation bar and contents
 
@@ -100,7 +100,7 @@ function plugin_navi_convert()
 
 		$prev = $home;
 		foreach ($pages as $page) {
-			if ($page == $current) break;
+			if ($page === $current) break;
 			$prev = $page;
 		}
 		$next = current($pages);
@@ -154,7 +154,7 @@ function plugin_navi_convert()
 		} else {
 			$ret .= '<ul>';
 			foreach ($pages as $page)
-				if ($page != $home)
+				if ($page !== $home)
 					$ret .= ' <li>' . make_pagelink($page) . '</li>';
 			$ret .= '</ul>';
 		}

--- a/plugin/popular.inc.php
+++ b/plugin/popular.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: popular.inc.php,v 1.18 2007/07/28 17:12:42 henoheno Exp $
+// $Id: popular.inc.php,v 1.19 2007/10/06 13:20:59 henoheno Exp $
 // Copyright (C)
 //   2003-2005, 2007 PukiWiki Developers Team
 //   2002 Kazunori Mizushima <[e-mail]>
@@ -78,7 +78,7 @@ function plugin_popular_convert()
 			$page = substr($page, 1);
 
 			$s_page = htmlspecialchars($page);
-			if ($page == $vars['page']) {
+			if ($page === $vars['page']) {
 				// No need to link itself, notifies where you just read
 				$pg_passage = get_pg_passage($page,FALSE);
 				$items .= ' <li><span title="' . $s_page . ' ' . $pg_passage . '">' .

--- a/plugin/rename.inc.php
+++ b/plugin/rename.inc.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: rename.inc.php,v 1.35 2007/07/28 14:02:48 henoheno Exp $
+// $Id: rename.inc.php,v 1.36 2007/10/06 13:20:59 henoheno Exp $
 // Copyright (C) 2002-2005, 2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -40,7 +40,7 @@ function plugin_rename_action()
 		$page  = plugin_rename_getvar('page');
 		$refer = plugin_rename_getvar('refer');
 
-		if ($refer === '') {
+		if ($refer == '') {
 			return plugin_rename_phase1();
 
 		} else if (! is_page($refer)) {
@@ -49,7 +49,7 @@ function plugin_rename_action()
 		} else if (is_cantedit($refer)) {
 			return plugin_rename_phase1('norename', $refer);
 
-		} else if ($page === '' || $page === $refer) {
+		} else if ($page == '' || $page === $refer) {
 			return plugin_rename_phase2();
 
 		} else if (! is_pagename($page)) {