As per mailing list: $wgOut->redirect auto expands; File::getFullUrl exists.

diff --git a/includes/SpecialFilepath.php b/includes/SpecialFilepath.php
index 37703df..84412ab 100644 (file)
--- a/includes/SpecialFilepath.php
+++ b/includes/SpecialFilepath.php
@@ -13,7 +13,7 @@ function wfSpecialFilepath( $par ) {
        } else {
                $file = wfFindFile( $title );
                if ( $file && $file->exists() ) {
-                       $wgOut->redirect( wfExpandUrl( $file->getURL() ) );
+                       $wgOut->redirect( $file->getURL() );
                } else {
                        $wgOut->setStatusCode( 404 );
                        $cform = new FilepathForm( $title );

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index b0d8289..bf59b44 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -134,7 +134,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                        $vals['thumbheight'] = $thumb->getHeight();
                                }
                        }
-                       $vals['url'] = wfExpandUrl( $f->getURL() );
+                       $vals['url'] = $f->getFullURL();
                }
                if($this->fld_comment)
                        $vals['comment'] = $f->getDescription();