From ee2626c4957413818c1199f9662e21dad5168ebf Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 25 Oct 2006 12:07:21 +0000 Subject: [PATCH] * (bug 7684) Obey watchcreated preference for Special:Upload watch checkbox --- RELEASE-NOTES | 1 + includes/SpecialUpload.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 953bb8a46e..56f5b5ded1 100644 --- 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 ade5805644..29d6f3bab6 100644 --- 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"' : ''; -- 2.20.1