From 750e7c1f884a528c8eff30aae823dab882ea6da1 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Wed, 27 Dec 2006 00:22:34 +0000
Subject: [PATCH] RELEASE-NOTES for last commit, and don't load the AJAX
 framework if we don't need it

---
 RELEASE-NOTES           | 1 +
 includes/OutputPage.php | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f7a8570eec..e5c2178636 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -415,6 +415,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Enable selflinks and categories to be written in some of the language variants
 * Prevent conversion of JavaScript code in language variants
 * Output software version number in maintenance/parserTests.php
+* (bug 7169) Use Ajax to watch/unwatch articles if enabled
 
 == Languages updated ==
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index d83e1e1634..74c041fb4d 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -535,7 +535,10 @@ class OutputPage {
 		$sk = $wgUser->getSkin();
 
 		if ( $wgUseAjax ) {
-			$this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajax.js?$wgStyleVersion\"></script>\n" );
+			// 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" );
+			}
 			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" );
-- 
2.20.1