| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -719,7 +719,12 @@ |
| 720 | 720 | } |
| 721 | 721 | wfProfileOut( "$fname-live" ); |
| 722 | 722 | |
| 723 | | - if( $this->loggedin ) { |
| | 723 | + /* If the user edits the article, then loads "watch this article" in background, and then |
| | 724 | + saves the article with "Watch this article" checkbox disabled, the article is transparently |
| | 725 | + unwatched. Therefore we do not show the "Watch this page" link in edit mode. Also avoids |
| | 726 | + accesskey conflict. */ |
| | 727 | + |
| | 728 | + if( $this->loggedin && $action != 'edit' && $action != 'submit' ) { |
| 724 | 729 | if( !$this->mTitle->userIsWatching()) { |
| 725 | 730 | $content_actions['watch'] = array( |
| 726 | 731 | 'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false, |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -44,6 +44,8 @@ |
| 45 | 45 | * (bug 6868) Un-hardcode section edit link style |
| 46 | 46 | * (bug 3205) Stop right floats from stacking horizontally in non-Monobook skins |
| 47 | 47 | * (bug 2013) Inherit ratios and not computed values for line-height |
| | 48 | +* (bug 2241) Hide watch tab on edit in favor of checkbox to avoid confusing |
| | 49 | + behavior and accesskey conflict |
| 48 | 50 | |
| 49 | 51 | == Languages updated == |
| 50 | 52 | |