| Index: trunk/phase3/includes/SpecialUpload.php |
| — | — | @@ -717,7 +717,9 @@ |
| 718 | 718 | |
| 719 | 719 | $encDestFile = htmlspecialchars( $this->mDestFile ); |
| 720 | 720 | |
| 721 | | - $watchChecked = $wgUser->getOption( 'watchdefault' ) |
| | 721 | + $watchChecked = |
| | 722 | + ( $wgUser->getOption( 'watchdefault' ) || |
| | 723 | + ( $wgUser->getOption( 'watchcreations' ) && $this->mDestFile == '' ) ) |
| 722 | 724 | ? 'checked="checked"' |
| 723 | 725 | : ''; |
| 724 | 726 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -87,6 +87,7 @@ |
| 88 | 88 | * (bug 6977) Remove 404 link for autogenerated database documentation. |
| 89 | 89 | * (bug 7369) Allow "Show Changes" without requiring edit token. |
| 90 | 90 | * (bug 7687) Fix movetalk box checks itself when confirming a delete and move. |
| | 91 | +* (bug 7684) Obey watchcreated preference for Special:Upload watch checkbox |
| 91 | 92 | |
| 92 | 93 | |
| 93 | 94 | == Languages updated == |