Force output of a full URL in Special:Filepath and ApiQueryImageInfo in case the...

diff --git a/includes/SpecialFilepath.php b/includes/SpecialFilepath.php
index 84412ab..37703df 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( $file->getURL() );
+                       $wgOut->redirect( wfExpandUrl( $file->getURL() ) );
                } else {
                        $wgOut->setStatusCode( 404 );
                        $cform = new FilepathForm( $title );

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index fdb389f..b0d8289 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -129,12 +129,12 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                $thumb = $f->getThumbnail($this->urlwidth, $this->urlheight);
                                if($thumb)
                                {
-                                       $vals['thumburl'] = $thumb->getURL();
+                                       $vals['thumburl'] = wfExpandUrl( $thumb->getURL() );
                                        $vals['thumbwidth'] = $thumb->getWidth();
                                        $vals['thumbheight'] = $thumb->getHeight();
                                }
                        }
-                       $vals['url'] = $f->getURL();
+                       $vals['url'] = wfExpandUrl( $f->getURL() );
                }
                if($this->fld_comment)
                        $vals['comment'] = $f->getDescription();