| Index: branches/wmf/1.18wmf1/includes/parser/Parser.php |
| — | — | @@ -2735,10 +2735,8 @@ |
| 2736 | 2736 | case 'server': |
| 2737 | 2737 | return $wgServer; |
| 2738 | 2738 | case 'servername': |
| 2739 | | - wfSuppressWarnings(); # May give an E_WARNING in PHP < 5.3.3 |
| 2740 | | - $serverName = parse_url( $wgServer, PHP_URL_HOST ); |
| 2741 | | - wfRestoreWarnings(); |
| 2742 | | - return $serverName ? $serverName : $wgServer; |
| | 2739 | + $serverParts = wfParseUrl( $wgServer ); |
| | 2740 | + return $serverParts && isset( $serverParts['host'] ) ? $serverParts['host'] : $wgServer; |
| 2743 | 2741 | case 'scriptpath': |
| 2744 | 2742 | return $wgScriptPath; |
| 2745 | 2743 | case 'stylepath': |