| Index: trunk/phase3/docs/globals.txt |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | # Generate the article HTML as if viewed by a web request |
| 11 | 11 | $article = new Article( Title::newFromText( $t ) ); |
| 12 | 12 | $article->view(); |
| 13 | | - |
| | 13 | + |
| 14 | 14 | versus |
| 15 | 15 | |
| 16 | 16 | # Save current globals |
| — | — | @@ -29,13 +29,13 @@ |
| 30 | 30 | globals will be eliminated from MediaWiki entirely, replaced by an application |
| 31 | 31 | object which would be passed to constructors. Whether that would be an |
| 32 | 32 | efficient, convenient solution remains to be seen, but certainly PHP 5 makes |
| 33 | | -such object-oriented programming models easier than they were in previous |
| | 33 | +such object-oriented programming models easier than they were in previous |
| 34 | 34 | versions. |
| 35 | 35 | |
| 36 | 36 | For the time being though, MediaWiki programmers will have to work in an |
| 37 | 37 | environment with some global context. At the time of writing, 418 globals were |
| 38 | | -initialised on startup by MediaWiki. 304 of these were configuration settings, |
| 39 | | -which are documented in DefaultSettings.php. There is no comprehensive |
| | 38 | +initialised on startup by MediaWiki. 304 of these were configuration settings, |
| | 39 | +which are documented in DefaultSettings.php. There is no comprehensive |
| 40 | 40 | documentation for the remaining 114 globals, however some of the most important |
| 41 | 41 | ones are listed below. They are typically initialised either in index.php or in |
| 42 | 42 | Setup.php. |
| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | * Bhojpuri (bho) (renamed from "bh"). |
| 102 | 102 | * (bug 29031) When translating block log entries, indefinite, infinite, and |
| 103 | 103 | infinity are now considered the same. |
| 104 | | - |
| | 104 | + |
| 105 | 105 | === Other changes in 1.19 === |
| 106 | 106 | * Removed legacy wgAjaxWatch javascript global object, no longer in use. |
| 107 | 107 | |
| Index: trunk/phase3/resources/jquery/jquery.makeCollapsible.js |
| — | — | @@ -294,14 +294,15 @@ |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | } else { // <div>, <p> etc. |
| | 298 | + |
| | 299 | + // The toggle-link will be the first child of the element |
| | 300 | + var $toggle = $that.find( '> .mw-collapsible-toggle' ); |
| | 301 | + |
| 298 | 302 | // If a direct child .content-wrapper does not exists, create it |
| 299 | 303 | if ( !$that.find( '> .mw-collapsible-content' ).length ) { |
| 300 | 304 | $that.wrapInner( '<div class="mw-collapsible-content"></div>' ); |
| 301 | 305 | } |
| 302 | 306 | |
| 303 | | - // The toggle-link will be the first child of the element |
| 304 | | - var $toggle = $that.find( '> .mw-collapsible-toggle' ); |
| 305 | | - |
| 306 | 307 | // If theres no toggle link, add it |
| 307 | 308 | if ( !$toggle.length ) { |
| 308 | 309 | $that.prepend( $toggleLink ); |