dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Move italic redirect link styles to modules"
[lhc/web/wiklou.git]
/
includes
/
upload
/
UploadFromUrl.php
diff --git
a/includes/upload/UploadFromUrl.php
b/includes/upload/UploadFromUrl.php
index
fc59ace
..
f897a79
100644
(file)
--- a/
includes/upload/UploadFromUrl.php
+++ b/
includes/upload/UploadFromUrl.php
@@
-175,7
+175,6
@@
class UploadFromUrl extends UploadBase {
$url = $request->getVal( 'wpUploadFileURL' );
return !empty( $url )
$url = $request->getVal( 'wpUploadFileURL' );
return !empty( $url )
- && Http::isValidURI( $url )
&& $wgUser->isAllowed( 'upload_by_url' );
}
&& $wgUser->isAllowed( 'upload_by_url' );
}
@@
-195,7
+194,7
@@
class UploadFromUrl extends UploadBase {
*/
public function fetchFile( $httpOptions = array() ) {
if ( !Http::isValidURI( $this->mUrl ) ) {
*/
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 ) ) {
}
if ( !self::isAllowedHost( $this->mUrl ) ) {
@@
-241,7
+240,7
@@
class UploadFromUrl extends UploadBase {
wfDebugLog(
'fileupload',
'Short write ' . $this->nbytes . '/' . strlen( $buffer ) .
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;
);
fclose( $this->mTmpHandle );
$this->mTmpHandle = false;