taking out $wgSharedUploadBaseUrl , which is not needed

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 06b7b3a..88041dc 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -130,12 +130,8 @@ $wgUploadBaseUrl    = "";
 # directory.
 #
 $wgUseSharedUploads = false;
-# Leave this blank if it is the same server. NO FINAL SLASH -
-# it is concatenated with $wgSharedUploadPath.
-# Example: "http://commons.wikimedia.org"
-$wgSharedUploadBaseUrl = "";
-# Path on the web server where shared uploads can be found
-$wgSharedUploadPath = "/shared/images";
+# Full path on the web server where shared uploads can be found
+$wgSharedUploadPath = "http://commons.wikimedia.org/shared/images";
 # Path on the file system where shared uploads can be found
 $wgSharedUploadDirectory = "/var/www/wiki3/images";
 # Set this to false especially if you have a set of files that need to be
@@ -143,7 +139,6 @@ $wgSharedUploadDirectory = "/var/www/wiki3/images";
 # directory layout.
 $wgHashedSharedUploadDirectory = true;
 
-
 # Email settings
 #
 /**

diff --git a/includes/Image.php b/includes/Image.php
index fcc9e6c..05167b7 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -239,11 +239,10 @@ class Image
        function wfImageUrl( $name, $fromSharedDirectory = false )
        {
                global $wgUploadPath,$wgUploadBaseUrl,$wgHashedUploadDirectory,
-                      $wgHashedSharedUploadDirectory,$wgSharedUploadBaseUrl,
-                      $wgSharedUploadPath;
+                      $wgHashedSharedUploadDirectory,$wgSharedUploadPath;
                if($fromSharedDirectory) {
                        $hash = $wgHashedSharedUploadDirectory;
-                       $base = $wgSharedUploadBaseUrl;
+                       $base = '';
                        $path = $wgSharedUploadPath;
                } else {
                        $hash = $wgHashedUploadDirectory;
@@ -277,11 +276,11 @@ class Image
        function thumbUrl( $width, $subdir='thumb') {
                global $wgUploadPath,$wgHashedUploadDirectory, $wgUploadBaseUrl,
                       $wgSharedUploadPath,$wgSharedUploadDirectory,
-                      $wgHashedSharedUploadDirectory, $wgSharedUploadBaseUrl;
+                      $wgHashedSharedUploadDirectory;
                $name = $this->thumbName( $width );
                if($this->fromSharedDirectory) {
                        $hashdir = $wgHashedSharedUploadDirectory;
-                       $base = $wgSharedUploadBaseUrl;
+                       $base = '';
                        $path = $wgSharedUploadPath;
                } else {
                        $hashdir = $wgHashedUploadDirectory;