Set $wgInternalServer to false by default, and fall back to $wgServer in the referrin...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index aabab5b..339dc03 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1768,7 +1768,7 @@ $wgUseXVO = false;
  * $wgInternalServer = 'http://yourinternal.tld:8000';
  * </code>
  */
-$wgInternalServer = $wgServer;
+$wgInternalServer = false;
 
 /**
  * Cache timeout for the squid, will be sent as s-maxage (without ESI) or

diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index 31f7aa6..91f1d28 100644 (file)
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -193,9 +193,10 @@ class SquidUpdate {
         * @return string
         */
        static function expand( $url ) {
-               global $wgInternalServer;
-               if( $url != '' && $url{0} == '/' ) {
-                       return $wgInternalServer . $url;
+               global $wgInternalServer, $wgServer;
+               $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer;
+               if( $url !== '' && $url[0] == '/' ) {
+                       return $server . $url;
                }
                return $url;
        }

diff --git a/includes/Title.php b/includes/Title.php
index 59a0803..a992bc9 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -990,8 +990,9 @@ class Title {
         * @return String the URL
         */
        public function getInternalURL( $query = '', $variant = false ) {
-               global $wgInternalServer;
-               $url = $wgInternalServer . $this->getLocalURL( $query, $variant );
+               global $wgInternalServer, $wgServer;
+               $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer;
+               $url = $server . $this->getLocalURL( $query, $variant );
                wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query ) );
                return $url;
        }