From 92b4cc29d4e20ebb4bc05920c3960b94f40e0b46 Mon Sep 17 00:00:00 2001
From: hinashiki <aono@slash-one.com>
Date: Fri, 13 May 2016 16:47:25 +0900
Subject: [PATCH] fix redirect url include "&" and "?" operaters.

---
 classes/seo.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/seo.php b/classes/seo.php
index 2d6daf8..f88e3fd 100644
--- 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);