* (bug 7684) Obey watchcreated preference for Special:Upload watch checkbox

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 953bb8a..56f5b5d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -87,6 +87,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6977) Remove 404 link for autogenerated database documentation.
 * (bug 7369) Allow "Show Changes" without requiring edit token.
 * (bug 7687) Fix movetalk box checks itself when confirming a delete and move.
+* (bug 7684) Obey watchcreated preference for Special:Upload watch checkbox
 
 
 == Languages updated ==

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index ade5805..29d6f3b 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -717,7 +717,9 @@ class UploadForm {
 
                $encDestFile = htmlspecialchars( $this->mDestFile );
 
-               $watchChecked = $wgUser->getOption( 'watchdefault' )
+               $watchChecked =
+                       ( $wgUser->getOption( 'watchdefault' ) ||
+                               ( $wgUser->getOption( 'watchcreations' ) && $this->mDestFile == '' ) )
                        ? 'checked="checked"'
                        : '';