allow specifying alternative image upload base url (like external servers)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0319147..0b0d67c 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -107,6 +107,7 @@ $wgLogo                             = "{$wgUploadPath}/wiki.png";
 $wgMathPath         = "{$wgUploadPath}/math";
 $wgMathDirectory    = "{$wgUploadDirectory}/math";
 $wgTmpDirectory     = "{$wgUploadDirectory}/tmp";
+$wgUploadBaseUrl    = "";
 /**#@-*/
 
 
@@ -161,6 +162,11 @@ $wgDBuser           = 'wikiuser';
  * "mysql" for working code and "PostgreSQL" for development/broken code
  */
 $wgDBtype           = "mysql";
+/** Search type
+ * "MyISAM" for MySQL native full text search, "Tsearch2" for PostgreSQL
+ * based search engine
+ */
+$wgSearchType      = "MyISAM";
 /** Table name prefix */
 $wgDBprefix         = ''; 
 /** Database schema

diff --git a/includes/Image.php b/includes/Image.php
index 4eb1613..7f6b839 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -114,10 +114,10 @@ class Image
 
        function wfImageUrl( $name )
        {
-               global $wgUploadPath;
+               global $wgUploadPath,$wgUploadBaseUrl;
                $hash = md5( $name );
 
-               $url = "{$wgUploadPath}/" . $hash{0} . "/" .
+               $url = "{$wgUploadBaseUrl}{$wgUploadPath}/" . $hash{0} . "/" .
                substr( $hash, 0, 2 ) . "/{$name}";
                return wfUrlencode( $url );
        }