aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-03-16 14:43:22 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-03-16 14:43:22 +0100
commit038b27abbaefe0ace5056dc2b03cee91f22a5fdb (patch)
tree9fcebcdc98bcce1b7760b380c38302bdf09140cb
parentcf8e431334e6f7d5f331b4e4d92a21eefd5d72db (diff)
parentee70b364c7380592df1d70ef9081e5981e97aad9 (diff)
downloadforums-038b27abbaefe0ace5056dc2b03cee91f22a5fdb.tar
forums-038b27abbaefe0ace5056dc2b03cee91f22a5fdb.tar.gz
forums-038b27abbaefe0ace5056dc2b03cee91f22a5fdb.tar.bz2
forums-038b27abbaefe0ace5056dc2b03cee91f22a5fdb.tar.xz
forums-038b27abbaefe0ace5056dc2b03cee91f22a5fdb.zip
Merge branch '3.1.x'
-rw-r--r--phpBB/phpbb/plupload/plupload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php
index 3c686a552f..fcce5b3bd8 100644
--- a/phpBB/phpbb/plupload/plupload.php
+++ b/phpBB/phpbb/plupload/plupload.php
@@ -326,7 +326,7 @@ class plupload
$tmp_file = $this->temporary_filepath($upload['tmp_name']);
- if (!move_uploaded_file($upload['tmp_name'], $tmp_file))
+ if (!phpbb_is_writable($this->temporary_directory) || !move_uploaded_file($upload['tmp_name'], $tmp_file))
{
$this->emit_error(103, 'PLUPLOAD_ERR_MOVE_UPLOADED');
}