| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -232,14 +232,10 @@ |
| 233 | 233 | <div style="clear:both"></div> |
| 234 | 234 | </div> |
| 235 | 235 | <!-- /footer --> |
| 236 | | - <?php $this->html( 'bottomscripts' ); /* JS call to runBodyOnloadHook */ ?> |
| 237 | 236 | <!-- fixalpha --> |
| 238 | 237 | <script type="<?php $this->text('jsmimetype') ?>"> if ( window.isMSIE55 ) fixalpha(); </script> |
| 239 | 238 | <!-- /fixalpha --> |
| 240 | | - <?php $this->html( 'reporttime' ) ?> |
| 241 | | - <?php if ( $this->data['debug'] ): ?> |
| 242 | | - <!-- Debug output: <?php $this->text( 'debug' ); ?> --> |
| 243 | | - <?php endif; ?> |
| | 239 | + <?php $this->printTrail(); ?> |
| 244 | 240 | </body> |
| 245 | 241 | </html> |
| 246 | 242 | <?php |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -181,15 +181,8 @@ |
| 182 | 182 | ?> |
| 183 | 183 | </div> |
| 184 | 184 | </div> |
| 185 | | -<?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> |
| 186 | | -<?php $this->html('reporttime') ?> |
| 187 | | -<?php if ( $this->data['debug'] ): ?> |
| 188 | | -<!-- Debug output: |
| 189 | | -<?php $this->text( 'debug' ); ?> |
| 190 | | - |
| 191 | | -<?php endif; |
| 192 | | - |
| | 185 | +<?php |
| | 186 | + $this->printTrail(); |
| 193 | 187 | echo Html::closeElement( 'body' ); |
| 194 | 188 | echo Html::closeElement( 'html' ); |
| 195 | 189 | wfRestoreWarnings(); |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -189,13 +189,7 @@ |
| 190 | 190 | ?> |
| 191 | 191 | </div> |
| 192 | 192 | |
| 193 | | - <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> |
| 194 | | -<?php $this->html('reporttime') ?> |
| 195 | | -<?php if ( $this->data['debug'] ): ?> |
| 196 | | -<!-- Debug output: |
| 197 | | -<?php $this->text( 'debug' ); ?> |
| 198 | | -<?php endif; ?> |
| | 193 | + <?php $this->printTrail(); ?> |
| 199 | 194 | </body></html> |
| 200 | 195 | <?php |
| 201 | 196 | wfRestoreWarnings(); |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -1716,6 +1716,21 @@ |
| 1717 | 1717 | return $footericons; |
| 1718 | 1718 | } |
| 1719 | 1719 | |
| | 1720 | + /** |
| | 1721 | + * Output the basic end-page trail including bottomscripts, reporttime, and |
| | 1722 | + * debug stuff. This should be called right before outputting the closing |
| | 1723 | + * body and html tags. |
| | 1724 | + */ |
| | 1725 | + function printTrail() { ?> |
| | 1726 | +<?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?> |
| | 1727 | +<?php $this->html('reporttime') ?> |
| | 1728 | +<?php if ( $this->data['debug'] ): ?> |
| | 1729 | +<!-- Debug output: |
| | 1730 | +<?php $this->text( 'debug' ); ?> |
| 1720 | 1731 | |
| | 1732 | +--> |
| | 1733 | +<?php endif; |
| | 1734 | + } |
| | 1735 | + |
| 1721 | 1736 | } |
| 1722 | 1737 | |