| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -2138,8 +2138,7 @@ |
| 2139 | 2139 | $ret .= implode( "\n", array( |
| 2140 | 2140 | $this->getHeadLinks(), |
| 2141 | 2141 | $this->buildCssLinks(), |
| 2142 | | - $this->getHeadScripts( $sk ), |
| 2143 | | - $this->getHeadItems(), |
| | 2142 | + $this->getHeadScripts( $sk ) . $this->getHeadItems(), |
| 2144 | 2143 | ) ); |
| 2145 | 2144 | if ( $sk->usercss ) { |
| 2146 | 2145 | $ret .= Html::inlineStyle( $sk->usercss ); |
| — | — | @@ -2202,7 +2201,7 @@ |
| 2203 | 2202 | global $wgUser, $wgRequest, $wgJsMimeType, $wgUseSiteJs; |
| 2204 | 2203 | global $wgStylePath, $wgStyleVersion; |
| 2205 | 2204 | |
| 2206 | | - $scripts = Skin::makeGlobalVariablesScript( $sk->getSkinName() ); |
| | 2205 | + $scripts = Skin::makeGlobalVariablesScript( $sk->getSkinName() ) . "\n"; |
| 2207 | 2206 | $scripts .= Html::linkedScript( "{$wgStylePath}/common/wikibits.js?$wgStyleVersion" ); |
| 2208 | 2207 | |
| 2209 | 2208 | // add site JS if enabled |