Fix up Configure extension logo setting handling:

* Replace annoying button with an onblur preview and server-side conversion of file names into URLs.

diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index d18f7a9..1a9adbc 100644 (file)
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -139,5 +139,20 @@ function wfAjaxGetThumbnailUrl( $file, $width, $height ) {
                
        $url = $file->getThumbnail( $width, $height )->url;
        
+       return $url;
+}
+
+/**
+ * Called in some places (currently just extensions)
+ * to get the URL for a given file.
+ */
+function wfAjaxGetFileUrl( $file ) {
+       $file = wfFindFile( $file );
+       
+       if ( !$file || !$file->exists() )
+               return null;
+               
+       $url = $file->getUrl();
+       
        return $url;
 }
\ No newline at end of file

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 06035d4..4510a91 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3328,7 +3328,7 @@ $wgUseAjax = true;
  * List of Ajax-callable functions.
  * Extensions acting as Ajax callbacks must register here
  */
-$wgAjaxExportList = array( 'wfAjaxGetThumbnailUrl' );
+$wgAjaxExportList = array( 'wfAjaxGetThumbnailUrl', 'wfAjaxGetFileUrl' );
 
 /**
  * Enable watching/unwatching pages using AJAX.