diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php index b02957955a..a01c15e79d 100644 --- a/lib/cache/sfFileCache.class.php +++ b/lib/cache/sfFileCache.class.php @@ -215,8 +215,7 @@ protected function read($path, $type = self::READ_DATA) @flock($fp, LOCK_SH); clearstatcache(); // because the filesize can be cached by PHP itself... $length = @filesize($path); - $mqr = get_magic_quotes_runtime(); - set_magic_quotes_runtime(0); + switch ($type) { case self::READ_TIMEOUT: @@ -240,7 +239,6 @@ protected function read($path, $type = self::READ_DATA) default: throw new sfConfigurationException(sprintf('Unknown type "%s".', $type)); } - set_magic_quotes_runtime($mqr); @flock($fp, LOCK_UN); @fclose($fp); diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php index d3d666178a..2a257daaac 100644 --- a/lib/request/sfWebRequest.class.php +++ b/lib/request/sfWebRequest.class.php @@ -878,7 +878,7 @@ public function getCookie($name, $defaultValue = null) if (isset($_COOKIE[$name])) { - $retval = get_magic_quotes_gpc() ? sfToolkit::stripslashesDeep($_COOKIE[$name]) : $_COOKIE[$name]; + $retval = $_COOKIE[$name]; } return $retval; @@ -1162,7 +1162,7 @@ protected function parseRequestParameters() protected function loadParameters() { // GET parameters - $this->getParameters = get_magic_quotes_gpc() ? sfToolkit::stripslashesDeep($_GET) : $_GET; + $this->getParameters = $_GET; $this->parameterHolder->add($this->getParameters); // additional parameters @@ -1170,7 +1170,7 @@ protected function loadParameters() $this->parameterHolder->add($this->requestParameters); // POST parameters - $this->postParameters = get_magic_quotes_gpc() ? sfToolkit::stripslashesDeep($_POST) : $_POST; + $this->postParameters = $_POST; $this->parameterHolder->add($this->postParameters); // move symfony parameters to attributes (parameters prefixed with _sf_)