diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-10-08 21:55:25 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-10-08 21:55:25 +0200 |
| commit | 13fe7b3ed22dbaeb2e2c9725ed38740a3b68e10a (patch) | |
| tree | b7a79bc5e502f13a60d6ce73f95ddd1b02ae153e /phpBB/phpbb | |
| parent | bcd4b01071c26108701297302f15f1d9f58abce2 (diff) | |
| parent | 89d1401a77f7a2f9ee067b90efa975e21363e914 (diff) | |
| download | forums-13fe7b3ed22dbaeb2e2c9725ed38740a3b68e10a.tar forums-13fe7b3ed22dbaeb2e2c9725ed38740a3b68e10a.tar.gz forums-13fe7b3ed22dbaeb2e2c9725ed38740a3b68e10a.tar.bz2 forums-13fe7b3ed22dbaeb2e2c9725ed38740a3b68e10a.tar.xz forums-13fe7b3ed22dbaeb2e2c9725ed38740a3b68e10a.zip | |
Merge pull request #5341 from senky/ticket/15742
[ticket/15742] Remove get_magic_quotes_gpc() call
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/request/request.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/request/type_cast_helper.php | 65 | ||||
| -rw-r--r-- | phpBB/phpbb/request/type_cast_helper_interface.php | 14 |
3 files changed, 0 insertions, 81 deletions
diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php index 00be8fd381..a0267d1370 100644 --- a/phpBB/phpbb/request/request.php +++ b/phpBB/phpbb/request/request.php @@ -150,8 +150,6 @@ class request implements \phpbb\request\request_interface return; } - $this->type_cast_helper->add_magic_quotes($value); - // setting to null means unsetting if ($value === null) { diff --git a/phpBB/phpbb/request/type_cast_helper.php b/phpBB/phpbb/request/type_cast_helper.php index 96e66950ca..912494998d 100644 --- a/phpBB/phpbb/request/type_cast_helper.php +++ b/phpBB/phpbb/request/type_cast_helper.php @@ -18,69 +18,6 @@ namespace phpbb\request; */ class type_cast_helper implements \phpbb\request\type_cast_helper_interface { - - /** - * @var string Whether slashes need to be stripped from input - */ - protected $strip; - - /** - * Initialises the type cast helper class. - * All it does is find out whether magic quotes are turned on. - */ - public function __construct() - { - if (version_compare(PHP_VERSION, '5.4.0-dev', '>=')) - { - $this->strip = false; - } - else - { - $this->strip = (@get_magic_quotes_gpc()) ? true : false; - } - } - - /** - * Recursively applies addslashes to a variable. - * - * @param mixed &$var Variable passed by reference to which slashes will be added. - */ - public function addslashes_recursively(&$var) - { - if (is_string($var)) - { - $var = addslashes($var); - } - else if (is_array($var)) - { - $var_copy = $var; - $var = array(); - foreach ($var_copy as $key => $value) - { - if (is_string($key)) - { - $key = addslashes($key); - } - $var[$key] = $value; - - $this->addslashes_recursively($var[$key]); - } - } - } - - /** - * Recursively applies addslashes to a variable if magic quotes are turned on. - * - * @param mixed &$var Variable passed by reference to which slashes will be added. - */ - public function add_magic_quotes(&$var) - { - if ($this->strip) - { - $this->addslashes_recursively($var); - } - } - /** * Set variable $result to a particular type. * @@ -129,8 +66,6 @@ class type_cast_helper implements \phpbb\request\type_cast_helper_interface $result = preg_replace('/[\x80-\xFF]/', '?', $result); } } - - $result = ($this->strip) ? stripslashes($result) : $result; } } diff --git a/phpBB/phpbb/request/type_cast_helper_interface.php b/phpBB/phpbb/request/type_cast_helper_interface.php index 2cb28d021f..9671573bf1 100644 --- a/phpBB/phpbb/request/type_cast_helper_interface.php +++ b/phpBB/phpbb/request/type_cast_helper_interface.php @@ -19,20 +19,6 @@ namespace phpbb\request; interface type_cast_helper_interface { /** - * Recursively applies addslashes to a variable. - * - * @param mixed &$var Variable passed by reference to which slashes will be added. - */ - public function addslashes_recursively(&$var); - - /** - * Recursively applies addslashes to a variable if magic quotes are turned on. - * - * @param mixed &$var Variable passed by reference to which slashes will be added. - */ - public function add_magic_quotes(&$var); - - /** * Set variable $result to a particular type. * * @param mixed &$result The variable to fill |