From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 13 Oct 2006 21:03:43 +0000 (+0000)
Subject: Reverting r16989 -- makes it extremely difficult to watch or unwatch a page that... 
X-Git-Tag: 1.31.0-rc.0~55505
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=dfe2be3e5bbc6208961bad047e5d2f2b1fe936a8;p=lhc%2Fweb%2Fwiklou.git

Reverting r16989 -- makes it extremely difficult to watch or unwatch a page that doesn't exist yet, unless you manually muck about with URLs
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e919bcd98d..d35be10363 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -44,8 +44,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6868) Un-hardcode section edit link style
 * (bug 3205) Stop right floats from stacking horizontally in non-Monobook skins
 * (bug 2013) Inherit ratios and not computed values for line-height
-* (bug 2241) Hide watch tab on edit in favor of checkbox to avoid confusing
-  behavior and accesskey conflict
 
 == Languages updated ==
 
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 05ed65d40d..9a948215b3 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -719,12 +719,7 @@ class SkinTemplate extends Skin {
 			}
 			wfProfileOut( "$fname-live" );
 
-			/* If the user edits the article, then loads "watch this article" in background, and then
-			   saves the article with "Watch this article" checkbox disabled, the article is transparently
-			   unwatched. Therefore we do not show the "Watch this page" link in edit mode. Also avoids
-			   accesskey conflict. */
-
-			if( $this->loggedin && $action != 'edit' && $action != 'submit' ) {
+			if( $this->loggedin ) {
 				if( !$this->mTitle->userIsWatching()) {
 					$content_actions['watch'] = array(
 						'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,