Reverting r16989 -- makes it extremely difficult to watch or unwatch a page that...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e919bcd..d35be10 100644 (file)
--- 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 05ed65d..9a94821 100644 (file)
--- 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,