| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -2271,9 +2271,7 @@ |
| 2272 | 2272 | */ |
| 2273 | 2273 | function wfUrlProtocols() { |
| 2274 | 2274 | global $wgUrlProtocols; |
| 2275 | | - |
| 2276 | | - // This function is called a lot, cache its return value |
| 2277 | | - // TODO: Cache this in memcached instead? |
| | 2275 | + |
| 2278 | 2276 | static $retval = null; |
| 2279 | 2277 | if ( !is_null( $retval ) ) |
| 2280 | 2278 | return $retval; |
| — | — | @@ -2289,7 +2287,6 @@ |
| 2290 | 2288 | } else { |
| 2291 | 2289 | $retval = $wgUrlProtocols; |
| 2292 | 2290 | } |
| 2293 | | - |
| 2294 | 2291 | return $retval; |
| 2295 | 2292 | } |
| 2296 | 2293 | |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -378,7 +378,7 @@ |
| 379 | 379 | $vars = array( |
| 380 | 380 | 'skin' => $skinName, |
| 381 | 381 | 'stylepath' => $wgStylePath, |
| 382 | | - 'urlprotocols' => wfUrlProtocols(), |
| | 382 | + 'wgUrlProtocols' => wfUrlProtocols(), |
| 383 | 383 | 'wgArticlePath' => $wgArticlePath, |
| 384 | 384 | 'wgScriptPath' => $wgScriptPath, |
| 385 | 385 | 'wgScriptExtension' => $wgScriptExtension, |