| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | * @param object $out Output page object to initialize |
| 28 | 28 | */ |
| 29 | 29 | public function initPage( OutputPage $out ) { |
| 30 | | - global $wgStylePath; |
| | 30 | + global $wgLocalStylePath; |
| 31 | 31 | |
| 32 | 32 | parent::initPage( $out ); |
| 33 | 33 | |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | // wait for the CSS file to load before fetching the HTC file. |
| 37 | 37 | $out->addScript( |
| 38 | 38 | '<!--[if lt IE 7]><style type="text/css">body{behavior:url("' . |
| 39 | | - $wgStylePath . |
| | 39 | + $wgLocalStylePath . |
| 40 | 40 | '/vector/csshover.htc")}</style><![endif]-->' |
| 41 | 41 | ); |
| 42 | 42 | } |
| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -39,6 +39,7 @@ |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | if( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins"; |
| | 43 | +if( $wgLocalStylePath === false ) $wgLocalStylePath = "$wgScriptPath/skins"; |
| 43 | 44 | if( $wgStyleDirectory === false) $wgStyleDirectory = "$IP/skins"; |
| 44 | 45 | if( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath = "$wgScriptPath/extensions"; |
| 45 | 46 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -145,6 +145,7 @@ |
| 146 | 146 | * asset paths as seen by users |
| 147 | 147 | */ |
| 148 | 148 | $wgStylePath = false; ///< defaults to "{$wgScriptPath}/skins" |
| | 149 | +$wgLocalStylePath = false; ///< defaults to the same value as $wgStylePath, and shouldn't point to an external domain |
| 149 | 150 | $wgExtensionAssetsPath = false; ///< defaults to "{$wgScriptPath}/extensions" |
| 150 | 151 | |
| 151 | 152 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -55,6 +55,9 @@ |
| 56 | 56 | * (bug 23276) Add hook to Special:NewPages to modify query |
| 57 | 57 | * Add accesskey 's' and tooltip to 'Save' button at Special:Preferences |
| 58 | 58 | * (bug 20186) Allow filtering Special:Contributions for RevisionDeleted edits |
| | 59 | +* (bug 22858) $wgLocalStylePath is by default set to the same value as |
| | 60 | + $wgStylePath but should never point to a different domain than the site is |
| | 61 | + on, allowing skins to use .htc files which are not cross-domain friendly. |
| 59 | 62 | |
| 60 | 63 | === Bug fixes in 1.17 === |
| 61 | 64 | * (bug 17560) Half-broken deletion moved image files to deletion archive |