diff options
| author | javiexin <javiexin@gmail.com> | 2017-05-21 12:58:05 +0200 |
|---|---|---|
| committer | javiexin <javiexin@gmail.com> | 2017-05-21 12:58:05 +0200 |
| commit | 1d5f5ccffcfd30a652734485b51066950bbb8a76 (patch) | |
| tree | 0b4bb4651a6fee88f14c9d7584a9584c31ccfafd | |
| parent | c2c5c20c319d397948218b4c342fb146bf15040b (diff) | |
| download | forums-1d5f5ccffcfd30a652734485b51066950bbb8a76.tar forums-1d5f5ccffcfd30a652734485b51066950bbb8a76.tar.gz forums-1d5f5ccffcfd30a652734485b51066950bbb8a76.tar.bz2 forums-1d5f5ccffcfd30a652734485b51066950bbb8a76.tar.xz forums-1d5f5ccffcfd30a652734485b51066950bbb8a76.zip | |
[ticket/15227] Remove STRIP, as always false
PHPBB3-15227
| -rw-r--r-- | phpBB/includes/startup.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/files/filespec.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/md5_phpbb2.php | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index 327971fa8a..0a413895ae 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -87,12 +87,8 @@ if (version_compare(PHP_VERSION, '5.4') < 0) { die('You are running an unsupported PHP version. Please upgrade to PHP 5.4.0 or higher before trying to install or update to phpBB 3.2'); } - // Register globals and magic quotes have been dropped in PHP 5.4 so no need for extra checks -/** -* @ignore -*/ -define('STRIP', false); + // In PHP 5.3.0 the error level has been raised to E_WARNING which causes problems // because we show E_WARNING errors and do not set a default timezone. diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php index 2ff2a92c83..f1a32ef4a8 100644 --- a/phpBB/phpbb/files/filespec.php +++ b/phpBB/phpbb/files/filespec.php @@ -129,7 +129,7 @@ class filespec $this->class_initialized = true; $this->filename = $upload_ary['tmp_name']; $this->filesize = $upload_ary['size']; - $name = (STRIP) ? stripslashes($upload_ary['name']) : $upload_ary['name']; + $name = $upload_ary['name']; $name = trim(utf8_basename($name)); $this->realname = $this->uploadname = $name; $this->mimetype = $upload_ary['type']; diff --git a/phpBB/phpbb/passwords/driver/md5_phpbb2.php b/phpBB/phpbb/passwords/driver/md5_phpbb2.php index bd8cc51e5a..b38b041d6c 100644 --- a/phpBB/phpbb/passwords/driver/md5_phpbb2.php +++ b/phpBB/phpbb/passwords/driver/md5_phpbb2.php @@ -95,7 +95,7 @@ class md5_phpbb2 extends base // in phpBB2 passwords were used exactly as they were sent, with addslashes applied $password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : ''; - $password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format; + $password_old_format = addslashes($password_old_format); $password_new_format = $this->request->variable('password', '', true); if ($super_globals_disabled) |