fix redirect url include "&" and "?" operaters.

hinashiki · May 13, 2016 · 92b4cc2 · 92b4cc2
1 parent 21da40f
commit 92b4cc2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/seo.php b/classes/seo.php
@@ -155,11 +155,11 @@ public function check_redirect()
 		if(\Fuel\Core\Input::get('page') === '1')
 		{
 			$redirect_flg = true;
-			$redirect_uri = preg_replace('/(&?)(page=1&?)/', '$1', $redirect_uri);
+			$redirect_uri = preg_replace('/[&?](page=1&?)/', '$1', $redirect_uri);
 		}
 
 		// last &, ? check (301 redirect)
-		if(preg_match('/[&\?]$/', $redirect_uri))
+		if(empty(\Input::get()) and  preg_match('/[&\?]$/', $redirect_uri))
 		{
 			$redirect_flg = true;
 			$redirect_uri = preg_replace('/[&\?]$/', '', $redirect_uri);