Fix https://bugzilla.mozilla.org/show_bug.cgi?id=852594 caused by

incorrect loading of wikibits.js
MozillaWiki · Mar 23, 2013 · 0e9a414 · 0e9a414
1 parent 9432255
commit 0e9a414
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/skins/Cavendish.php b/skins/Cavendish.php
@@ -89,9 +89,7 @@ function head() {
 	<?php $this->html('csslinks') ?>
 	<style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css"; /*]]>*/</style>
 	<link rel="stylesheet" type="text/css" media="print" href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
-	<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
-	<script type="text/javascript" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js"></script>
-	<?php
+	<?php print Skin::makeGlobalVariablesScript( $this->data );
 	$jsBit = array( 'jsvarurl', 'userjs', 'userjsprev' );
 	foreach( $jsBit as $bit ) {
 		if( isset( $this->data[ $bit ] ) ) {
@@ -237,7 +235,7 @@ function body() {
 
 	</div><!-- end of MBODY div -->
 <?php
-    }
+	}
 
 	function footer() {
 ?>

diff --git a/skins/gmo.php b/skins/gmo.php
@@ -100,9 +100,8 @@ function head() {
 	<?php $this->html('csslinks') ?>
 
 	<link rel="stylesheet" type="text/css" media="print" href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
-	<?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
-	<script type="text/javascript" src="<?php                                   $this->text('stylepath' ) ?>/common/wikibits.js"></script>
-	<?php if($this->data['jsvarurl'  ]) { ?><script type="text/javascript" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
+	<?php print Skin::makeGlobalVariablesScript( $this->data );
+	if($this->data['jsvarurl'  ]) { ?><script type="text/javascript" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
 	<?php   if($this->data['pagecss']) { ?>
 			<style type="text/css"><?php $this->html('pagecss') ?></style>
 	<?php   } ?>