10000 Remove(legacy): drop PHP v5.4 check and compatibility layer on sfWebR… · connorhu/symfony1@64d9fc0 · GitHub
[go: up one dir, main page]

Skip to content

Commit 64d9fc0

Browse files
committed
Remove(legacy): drop PHP v5.4 check and compatibility layer on sfWebRequest
1 parent 4cab155 commit 64d9fc0

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

lib/request/sfWebRequest.class.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
6767
), $options);
6868
parent::initialize($dispatcher, $parameters, $attributes, $options);
6969

70-
// GET parameters
71-
if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
72-
$this->getParameters = sfToolkit::stripslashesDeep($_GET);
73-
} else {
74-
$this->getParameters = $_GET;
75-
}
70+
$this->getParameters = $_GET;
71+
7672
$this->parameterHolder->add($this->getParameters);
7773

7874
$postParameters = $_POST;
@@ -140,11 +136,7 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
140136
$this->setMethod(self::GET);
141137
}
142138

143-
if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
144-
$this->postParameters = sfToolkit::stripslashesDeep($postParameters);
145-
} else {
146-
$this->postParameters = $postParameters;
147-
}
139+
$this->postParameters = $postParameters;
148140

149141
$this->parameterHolder->add($this->postParameters);
150142

@@ -553,11 +545,7 @@ public function getCookie($name, $defaultValue = null)
553545
$retval = $defaultValue;
554546

555547
if (isset($_COOKIE[$name])) {
556-
if (version_compare(PHP_VERSION, '5.4.0-dev', '<') && get_magic_quotes_gpc()) {
557-
$retval = sfToolkit::stripslashesDeep($_COOKIE[$name]);
558-
} else {
559-
$retval = $_COOKIE[$name];
560-
}
548+
$retval = $_COOKIE[$name];
561549
}
562550

563551
return $retval;

0 commit comments

Comments
 (0)
0