Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226725
Change subject: The http-invalid-url message has a parameter, so send it
......................................................................
The http-invalid-url message has a parameter, so send it
Currently was outputting raw $1 to user.
Change-Id: If1d10270f4d446c4d1703457903034e8356c1503
---
M includes/HttpFunctions.php
M includes/upload/UploadFromUrl.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/25/226725/1
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 825cd06..7b43a2d 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -252,7 +252,7 @@
$this->parsedUrl = wfParseUrl( $this->url );
if ( !$this->parsedUrl || !Http::isValidURI( $this->url ) ) {
- $this->status = Status::newFatal( 'http-invalid-url' );
+ $this->status = Status::newFatal( 'http-invalid-url',
$url );
} else {
$this->status = Status::newGood( 100 ); // continue
}
diff --git a/includes/upload/UploadFromUrl.php
b/includes/upload/UploadFromUrl.php
index 4c099b3..f578745 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -195,7 +195,7 @@
*/
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 ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/226725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1d10270f4d446c4d1703457903034e8356c1503
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
