diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 13:20:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 13:20:41 +0000 |
| commit | fa22522236cd608286863faca5412a37e6eeab2c (patch) | |
| tree | 748c5cf9521eccb364c69512f9f53680dd3aa609 /phpBB | |
| parent | af8cb0674b0faa338a840b4144b1da66be5dad64 (diff) | |
| download | forums-fa22522236cd608286863faca5412a37e6eeab2c.tar forums-fa22522236cd608286863faca5412a37e6eeab2c.tar.gz forums-fa22522236cd608286863faca5412a37e6eeab2c.tar.bz2 forums-fa22522236cd608286863faca5412a37e6eeab2c.tar.xz forums-fa22522236cd608286863faca5412a37e6eeab2c.zip | |
#23525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8522 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_upload.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2c75581b7f..52d5fc6c3b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -99,6 +99,7 @@ <li>[Fix] Unable to login to some jabber server, reverted previous change (Bug #25095)</li> <li>[Fix] Do not return BMP as valid image type for GD image manipulation (Bug #25925)</li> <li>[Change] For determining the maximum number of private messages in one box, use the biggest value from all groups the user is a member of (Bug #24665)</li> + <li>[Fix] Correctly determine safe mode for temp file creation in functions_upload.php (Bug #23525)</li> </ul> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index ca4f51c12f..50108068cd 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -257,7 +257,7 @@ class filespec return false; } - $upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode')) ? 'move' : 'copy'; + $upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') ? 'move' : 'copy'; $upload_mode = ($this->local) ? 'local' : $upload_mode; $this->destination_file = $this->destination_path . '/' . basename($this->realname); @@ -741,7 +741,7 @@ class fileupload return $file; } - $tmp_path = (!@ini_get('safe_mode')) ? false : $phpbb_root_path . 'cache'; + $tmp_path = (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') ? false : $phpbb_root_path . 'cache'; $filename = tempnam($tmp_path, unique_id() . '-'); if (!($fp = @fopen($filename, 'wb'))) |