提交: 6ac4ecfdde6e5e5b1f0b85022c9c81b2c6a22c30 - pukiwiki15 (git)

PukiWiki

Commit MetaInfo

• 修訂: 6ac4ecfdde6e5e5b1f0b85022c9c81b2c6a22c30 (tree)
• 時間: 2016-01-08 03:47:44
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack2/369 Follow PHP7 changes of internal array pointer

Backward incompatible change of PHP7:

foreach no longer changes the internal array pointer

We already don't use current() function for array to calculate prev/next.

http://php.net/manual/en/migration70.incompatible.php#migration70.incompatible.foreach.array-pointer
http://wiki.php.net/rfc/php7_foreach

Change Summary

• modified: plugin/navi.inc.php

差異

--- a/plugin/navi.inc.php
+++ b/plugin/navi.inc.php
@@ -97,13 +97,19 @@ function plugin_navi_convert()
 		$pages   = array_unique($pages);
 		natcasesort($pages);
 		if ($reverse) $pages = array_reverse($pages);
-
+		$pages = array_values($pages);
 		$prev = $home;
-		foreach ($pages as $page) {
-			if ($page === $current) break;
+		$next = '';
+		foreach ($pages as $index=>$page) {
+			if ($page === $current) {
+				$next_key = $index + 1;
+				if (array_key_exists($next_key, $pages)) {
+					$next = $pages[$next_key];
+				}
+				break;
+			}
 			$prev = $page;
 		}
-		$next = current($pages);
 
 		$pos = strrpos($current, '/');
 		$up = '';