複合演算子に置き換え

取りこぼし分を全て修正
logue · Apr 29, 2016 · 9e1b217 · 9e1b217
1 parent 780b7f0
commit 9e1b217
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/wiki-common/lib/PukiWiki/Lang/Holiday/PublicHoliday.php b/wiki-common/lib/PukiWiki/Lang/Holiday/PublicHoliday.php
@@ -260,7 +260,7 @@ private function zeller($y,$m,$d)
 			$y--;
 			$m += 12;
 		}
-		$d = $y + floor($y/4) - floor($y/100) + floor($y/400) + floor(2.6*$m+1.6) + $d;
+		$d += $y + floor($y/4) - floor($y/100) + floor($y/400) + floor(2.6*$m+1.6);
 		return ($d%7);
 	}
 

diff --git a/wiki-common/plugin/tracker.inc.php b/wiki-common/plugin/tracker.inc.php
@@ -1385,7 +1385,7 @@ function _replace_title($matches = array())
 		}
 
 		// This column will be the first position , if you click
-		$orders = array($fieldname => $order) + $orders;
+		$orders += array($fieldname => $order);
 
 		$_orders = array();
 		foreach ($orders as $_fieldname => $_order) {