| Index: branches/wmf-deployment/includes/OutputPage.php |
| — | — | @@ -126,7 +126,7 @@ |
| 127 | 127 | global $wgStylePath, $wgScript, $wgUser; |
| 128 | 128 | global $wgEnableScriptLoader, $wgScriptPath; |
| 129 | 129 | |
| 130 | | - if( substr( $file, 0, 1 ) == '/' ) { |
| | 130 | + if( substr( $file, 0, 1 ) == '/' || substr( $file, 0, 7 ) == 'http://' ) { |
| 131 | 131 | $path = $file; |
| 132 | 132 | } else { |
| 133 | 133 | $path = "{$wgStylePath}/common/{$file}"; |
| Property changes on: branches/wmf-deployment/includes/OutputPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 134 | 134 | - /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/wmf-deployment/includes/OutputPage.php:53381 |
| /trunk/phase3/includes/OutputPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57472,57530,57541,57602,57916,58151,58219,58633,58816,60704,61431,61557,61568 |
| 135 | 135 | + /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/wmf-deployment/includes/OutputPage.php:53381 |
| /trunk/phase3/includes/OutputPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57472,57530,57541,57602,57916,58151,58219,58633,58816,60704,61431,61557,61568,61836 |