Added a switch to determine whether an Input::setGet() parameter wi…

…ll be checked (see #4277)
contao · Jan 15, 2013 · 774a54b · 774a54b
1 parent 6cfa151
commit 774a54b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/system/modules/core/classes/Frontend.php b/system/modules/core/classes/Frontend.php
@@ -265,7 +265,7 @@ public static function getPageIdFromUrl()
 				return false;
 			}
 
-			\Input::setGet($arrFragments[$i], $arrFragments[$i+1]);
+			\Input::setGet($arrFragments[$i], $arrFragments[$i+1], true);
 		}
 
 		return $arrFragments[0] ?: null;

diff --git a/system/modules/core/library/Contao/Input.php b/system/modules/core/library/Contao/Input.php
@@ -270,10 +270,11 @@ public static function cookie($strKey, $blnDecodeEntities=false)
 	/**
 	 * Set a $_GET variable
 	 * 
-	 * @param string $strKey   The variable name
-	 * @param mixed  $varValue The variable value
+	 * @param string  $strKey       The variable name
+	 * @param mixed   $varValue     The variable value
+	 * @param boolean $blnAddUnused If true, the value usage will be checked
 	 */
-	public static function setGet($strKey, $varValue)
+	public static function setGet($strKey, $varValue, $blnAddUnused=false)
 	{
 		$strKey = static::cleanKey($strKey);
 
@@ -287,7 +288,11 @@ public static function setGet($strKey, $varValue)
 		else
 		{
 			$_GET[$strKey] = $varValue;
-			static::$arrUnusedGet[$strKey] = $varValue; // see #4277
+
+			if ($blnAddUnused)
+			{
+				static::$arrUnusedGet[$strKey] = $varValue; // see #4277
+			}
 		}
 	}