| Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
| — | — | @@ -23,6 +23,8 @@ |
| 24 | 24 | * (bug 33240) Sort images are missing but referenced in css. |
| 25 | 25 | * (bug 31921) Magic words REVISIONDAY, REVISIONMONTH and REVISIONYEAR were |
| 26 | 26 | not showing their values on preview. |
| | 27 | +* (bug 32702) Removed method Skin::makeGlobalVariablesScript() has been readded |
| | 28 | + for backward compatibility. |
| 27 | 29 | |
| 28 | 30 | == MediaWiki 1.18 == |
| 29 | 31 | 2011-11-24 |
| Index: branches/REL1_18/phase3/includes/OutputPage.php |
| — | — | @@ -2618,12 +2618,15 @@ |
| 2619 | 2619 | /** |
| 2620 | 2620 | * Get an array containing the variables to be set in mw.config in JavaScript. |
| 2621 | 2621 | * |
| | 2622 | + * DO NOT CALL THIS FROM OUTSIDE OF THIS CLASS OR Skin::makeGlobalVariablesScript(). |
| | 2623 | + * This is only public until that function is removed. You have been warned. |
| | 2624 | + * |
| 2622 | 2625 | * Do not add things here which can be evaluated in ResourceLoaderStartupScript |
| 2623 | 2626 | * - in other words, page-indendent/site-wide variables (without state). |
| 2624 | 2627 | * You will only be adding bloat to the html page and causing page caches to |
| 2625 | 2628 | * have to be purged on configuration changes. |
| 2626 | 2629 | */ |
| 2627 | | - protected function getJSVars() { |
| | 2630 | + public function getJSVars() { |
| 2628 | 2631 | global $wgUseAjax, $wgEnableMWSuggest, $wgContLang; |
| 2629 | 2632 | |
| 2630 | 2633 | $title = $this->getTitle(); |
| Property changes on: branches/REL1_18/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2631 | 2634 | Merged /trunk/phase3/includes/OutputPage.php:r107595 |
| Index: branches/REL1_18/phase3/includes/Skin.php |
| — | — | @@ -403,6 +403,20 @@ |
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | /** |
| | 407 | + * Make a <script> tag containing global variables |
| | 408 | + * |
| | 409 | + * @param $unused Unused |
| | 410 | + * @return string HTML fragment |
| | 411 | + */ |
| | 412 | + public static function makeGlobalVariablesScript( $unused ) { |
| | 413 | + global $wgOut; |
| | 414 | + |
| | 415 | + wfDeprecated( __METHOD__, '1.19' ); |
| | 416 | + |
| | 417 | + return self::makeVariablesScript( $wgOut->getJSVars() ); |
| | 418 | + } |
| | 419 | + |
| | 420 | + /** |
| 407 | 421 | * Get the query to generate a dynamic stylesheet |
| 408 | 422 | * |
| 409 | 423 | * @return array |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 410 | 424 | Merged /trunk/phase3/includes:r107595 |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 411 | 425 | Merged /trunk/phase3:r107595 |