From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Wed, 27 Dec 2006 01:17:55 +0000 (+0000)
Subject: Revert the conditional un-including of ajax.js from last commit after conversation... 
X-Git-Tag: 1.31.0-rc.0~54757
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=815a3de2bb4c4373b3615080cb19a95e64e8270e;p=lhc%2Fweb%2Fwiklou.git

Revert the conditional un-including of ajax.js from last commit after conversation with brion on IRC.  Will someone think of the poor extensions!
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 74c041fb4d..d83e1e1634 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -535,10 +535,7 @@ class OutputPage {
 		$sk = $wgUser->getSkin();
 
 		if ( $wgUseAjax ) {
-			// No point in enabling it if watching is the only enabled thing and the user isn't logged in
-			if( $wgAjaxSearch || ( $wgAjaxWatch && $wgUser->isLoggedIn() )) {
-				$this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajax.js?$wgStyleVersion\"></script>\n" );
-			}
+			$this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajax.js?$wgStyleVersion\"></script>\n" );
 			if( $wgAjaxSearch ) {
 				$this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajaxsearch.js\"></script>\n" );
 				$this->addScript( "<script type=\"{$wgJsMimeType}\">hookEvent(\"load\", sajax_onload);</script>\n" );