| Index: branches/wmf/1.17wmf1/includes/Title.php |
| — | — | @@ -985,8 +985,9 @@ |
| 986 | 986 | * @return \type{\string} the URL |
| 987 | 987 | */ |
| 988 | 988 | public function getInternalURL( $query = '', $variant = false ) { |
| 989 | | - global $wgInternalServer; |
| 990 | | - $url = $wgInternalServer . $this->getLocalURL( $query, $variant ); |
| | 989 | + global $wgInternalServer, $wgServer; |
| | 990 | + $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer; |
| | 991 | + $url = $server . $this->getLocalURL( $query, $variant ); |
| 991 | 992 | wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query ) ); |
| 992 | 993 | return $url; |
| 993 | 994 | } |
| Property changes on: branches/wmf/1.17wmf1/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 994 | 995 | Merged /trunk/phase3/includes/Title.php:r83512 |
| Index: branches/wmf/1.17wmf1/includes/DefaultSettings.php |
| — | — | @@ -1712,7 +1712,7 @@ |
| 1713 | 1713 | * $wgInternalServer = 'http://yourinternal.tld:8000'; |
| 1714 | 1714 | * </code> |
| 1715 | 1715 | */ |
| 1716 | | -$wgInternalServer = $wgServer; |
| | 1716 | +$wgInternalServer = false; |
| 1717 | 1717 | |
| 1718 | 1718 | /** |
| 1719 | 1719 | * Cache timeout for the squid, will be sent as s-maxage (without ESI) or |
| Property changes on: branches/wmf/1.17wmf1/includes/DefaultSettings.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1720 | 1720 | Merged /trunk/phase3/includes/DefaultSettings.php:r83512 |
| Index: branches/wmf/1.17wmf1/includes/SquidUpdate.php |
| — | — | @@ -193,9 +193,10 @@ |
| 194 | 194 | * @return string |
| 195 | 195 | */ |
| 196 | 196 | static function expand( $url ) { |
| 197 | | - global $wgInternalServer; |
| 198 | | - if( $url != '' && $url{0} == '/' ) { |
| 199 | | - return $wgInternalServer . $url; |
| | 197 | + global $wgInternalServer, $wgServer; |
| | 198 | + $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer; |
| | 199 | + if( $url !== '' && $url[0] == '/' ) { |
| | 200 | + return $server . $url; |
| 200 | 201 | } |
| 201 | 202 | return $url; |
| 202 | 203 | } |
| Property changes on: branches/wmf/1.17wmf1/includes/SquidUpdate.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 203 | 204 | Merged /branches/new-installer/phase3/includes/SquidUpdate.php:r43664-66004 |
| 204 | 205 | Merged /branches/wmf-deployment/includes/SquidUpdate.php:r53381,60970 |
| 205 | 206 | Merged /branches/REL1_15/phase3/includes/SquidUpdate.php:r51646 |
| 206 | 207 | Merged /branches/wmf/1.16wmf4/includes/SquidUpdate.php:r67177,69199,76243,77266 |
| 207 | 208 | Merged /branches/sqlite/includes/SquidUpdate.php:r58211-58321 |
| 208 | 209 | Merged /trunk/phase3/includes/SquidUpdate.php:r83512 |