diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/upload/UploadFromUrl.php | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/upload/UploadFromUrl.php')
-rw-r--r-- | includes/upload/UploadFromUrl.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php index fc59ace5..f5787451 100644 --- a/includes/upload/UploadFromUrl.php +++ b/includes/upload/UploadFromUrl.php @@ -195,7 +195,7 @@ class UploadFromUrl extends UploadBase { */ public function fetchFile( $httpOptions = array() ) { if ( !Http::isValidURI( $this->mUrl ) ) { - return Status::newFatal( 'http-invalid-url' ); + return Status::newFatal( 'http-invalid-url', $this->mUrl ); } if ( !self::isAllowedHost( $this->mUrl ) ) { @@ -241,7 +241,7 @@ class UploadFromUrl extends UploadBase { wfDebugLog( 'fileupload', 'Short write ' . $this->nbytes . '/' . strlen( $buffer ) . - ' bytes, aborting with ' . $this->mFileSize . ' uploaded so far' + ' bytes, aborting with ' . $this->mFileSize . ' uploaded so far' ); fclose( $this->mTmpHandle ); $this->mTmpHandle = false; |