diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 15:10:59 +0000 |
| commit | 91d0c8b3bf41dfed42d8e33595c0e530a431db1c (patch) | |
| tree | 025fdf94609a4875d691f3580c5bee7ef407f9bc /phpBB/includes/functions_upload.php | |
| parent | f2ba40f294d8e9e75a3adb78eedb2dc47633043e (diff) | |
| download | forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.gz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.bz2 forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.tar.xz forums-91d0c8b3bf41dfed42d8e33595c0e530a431db1c.zip | |
merge again, revisions 8516 to 8525
git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 181401200c..0a1ed1fab2 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'))) |