| Index: trunk/phase3/skins/common/ajax.js |
| — | — | @@ -75,7 +75,9 @@ |
| 76 | 76 | var i, x, n; |
| 77 | 77 | var uri; |
| 78 | 78 | var post_data; |
| 79 | | - uri = wgServer + wgScriptPath + "/index.php?action=ajax"; |
| | 79 | + uri = wgServer + |
| | 80 | + ((wgServer == null) ? (wgScriptPath + "/index.php") : wgScript) + |
| | 81 | + "?action=ajax"; |
| 80 | 82 | if (sajax_request_type == "GET") { |
| 81 | 83 | if (uri.indexOf("?") == -1) |
| 82 | 84 | uri = uri + "?rs=" + encodeURIComponent(func_name); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1198,7 +1198,7 @@ |
| 1199 | 1199 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1200 | 1200 | * styles. |
| 1201 | 1201 | */ |
| 1202 | | -$wgStyleVersion = '77'; |
| | 1202 | +$wgStyleVersion = '78'; |
| 1203 | 1203 | |
| 1204 | 1204 | |
| 1205 | 1205 | # Server-side caching: |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -293,7 +293,7 @@ |
| 294 | 294 | * The odd calling convention is for backwards compatibility |
| 295 | 295 | */ |
| 296 | 296 | static function makeGlobalVariablesScript( $data ) { |
| 297 | | - global $wgStylePath, $wgUser; |
| | 297 | + global $wgScript, $wgStylePath, $wgUser; |
| 298 | 298 | global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang; |
| 299 | 299 | global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle; |
| 300 | 300 | global $wgBreakFrames, $wgRequest; |
| — | — | @@ -306,6 +306,7 @@ |
| 307 | 307 | 'stylepath' => $wgStylePath, |
| 308 | 308 | 'wgArticlePath' => $wgArticlePath, |
| 309 | 309 | 'wgScriptPath' => $wgScriptPath, |
| | 310 | + 'wgScript' => $wgScript, |
| 310 | 311 | 'wgServer' => $wgServer, |
| 311 | 312 | 'wgCanonicalNamespace' => $nsname, |
| 312 | 313 | 'wgCanonicalSpecialPageName' => SpecialPage::resolveAlias( $wgTitle->getDBKey() ), |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -224,6 +224,8 @@ |
| 225 | 225 | * (bug 7071) Properly handle an 'oldid' passed to view or edit that doesn't |
| 226 | 226 | match the given title. Fixes inconsistencies with talk, history, edit links. |
| 227 | 227 | * (bug 10397) Fix AJAX watch error fallback when we receive a bogus result |
| | 228 | +* (bug 10396) Fix AJAX error when $wgScriptPath/index.php is not valid; |
| | 229 | + using $wgScript now included in JS info |
| 228 | 230 | |
| 229 | 231 | |
| 230 | 232 | == API changes since 1.10 == |