From: Chad Horohoe Date: Sun, 19 Apr 2009 21:03:30 +0000 (+0000) Subject: Reverting r49646 (and followups r49647 r49650) per comments on code review: X-Git-Tag: 1.31.0-rc.0~42103 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=commitdiff_plain;h=94cdb82e2d7a90d6f1770a72671cc7c60a2a3b54;p=lhc%2Fweb%2Fwiklou.git Reverting r49646 (and followups r49647 r49650) per comments on code review: * Could possibly be 1 pref instead of two to reduce clutter * A pref for NewPages doesn't belong with prefs for RecentChanges * This should definitely wait for the preference branch to be merged --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f177bfb685..e7a40438b1 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -170,8 +170,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Special:AllPages: Move hardcoded styles from code to CSS * (bug 6092) Add parser function equivalents of {{REVISIONID}}, {{REVISIONTIMESTAMP}} (and friends) and {{REVISIONUSER}} magic words -* (bug 7039) Show/hide bots/own edits from Recentchanges via preferences -* Show/hide bots/own edits from Newpage via preferences === Bug fixes in 1.15 === * (bug 16968) Special:Upload no longer throws useless warnings. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 47ae300be7..2684ef5087 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2444,7 +2444,6 @@ $wgDefaultUserOptions = array( 'rclimit' => 50, 'wllimit' => 250, 'hideminor' => 0, - 'rc_hidebots' => 1, 'hidepatrolled' => 0, 'newpageshidepatrolled' => 0, 'highlightbroken' => 1, diff --git a/includes/User.php b/includes/User.php index bdb3706be4..c1d266433b 100644 --- a/includes/User.php +++ b/includes/User.php @@ -53,10 +53,6 @@ class User { 'highlightbroken', 'justify', 'hideminor', - 'rc_hidebots', - 'rc_hideown', - 'newpageshidebots', - 'newpageshideown', 'extendwatchlist', 'usenewrc', 'numberheadings', diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 2926fdf563..886c41a254 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -25,8 +25,7 @@ class SpecialNewpages extends SpecialPage { $this->opts = $opts; // bind $opts->add( 'hideliu', false ); $opts->add( 'hidepatrolled', $wgUser->getBoolOption( 'newpageshidepatrolled' ) ); - $opts->add( 'hidebots', $wgUser->getBoolOption( 'newpageshidebots' ) ); - $opts->add( 'hideown', $wgUser->getBoolOption( 'newpageshideown' ) ); + $opts->add( 'hidebots', false ); $opts->add( 'hideredirs', true ); $opts->add( 'limit', (int)$wgUser->getOption( 'rclimit' ) ); $opts->add( 'offset', '' ); @@ -61,8 +60,6 @@ class SpecialNewpages extends SpecialPage { $this->opts->setValue( 'hidepatrolled', true ); if ( 'hidebots' == $bit ) $this->opts->setValue( 'hidebots', true ); - if ( 'hideown' == $bit ) - $this->opts->setValue( 'hideown', true ); if ( 'showredirs' == $bit ) $this->opts->setValue( 'hideredirs', false ); if ( is_numeric( $bit ) ) @@ -135,7 +132,6 @@ class SpecialNewpages extends SpecialPage { 'hideliu' => 'rcshowhideliu', 'hidepatrolled' => 'rcshowhidepatr', 'hidebots' => 'rcshowhidebots', - 'hideown' => 'rcshowhidemine', 'hideredirs' => 'whatlinkshere-hideredirs' ); @@ -391,7 +387,6 @@ class NewPagesPager extends ReverseChronologicalPager { function getQueryInfo() { global $wgEnableNewpagesUserFilter, $wgGroupPermissions, $wgUser; - $dbr = wfGetDB( DB_SLAVE ); $conds = array(); $conds['rc_new'] = 1; @@ -423,13 +418,7 @@ class NewPagesPager extends ReverseChronologicalPager { if( $this->opts->getValue( 'hidebots' ) ) { $conds['rc_bot'] = 0; } - if( $this->opts->getValue( 'hideown' ) ) { - if( $wgUser->getId() ) { - $conds[] = 'rc_user != ' . $dbr->addQuotes( $wgUser->getId() ); - } else { - $conds[] = 'rc_user_text != ' . $dbr->addQuotes( $wgUser->getName() ); - } - } + if ( $this->opts->getValue( 'hideredirs' ) ) { $conds['page_is_redirect'] = 0; } diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php index d53b81f43a..e40e83ec48 100644 --- a/includes/specials/SpecialPreferences.php +++ b/includes/specials/SpecialPreferences.php @@ -1162,14 +1162,10 @@ class PreferencesForm { ); $toggles[] = 'hideminor'; - $toggles[] = 'rc_hidebots'; - $toggles[] = 'newpageshidebots'; if( $wgUseRCPatrol ) { $toggles[] = 'hidepatrolled'; $toggles[] = 'newpageshidepatrolled'; } - $toggles[] = 'rc_hideown'; - $toggles[] = 'newpageshideown'; if( $wgRCShowWatchingUsers ) $toggles[] = 'shownumberswatching'; $toggles[] = 'usenewrc'; diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index f409cad1e5..78843a802a 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -24,11 +24,11 @@ class SpecialRecentChanges extends SpecialPage { $opts->add( 'from', '' ); $opts->add( 'hideminor', $wgUser->getBoolOption( 'hideminor' ) ); - $opts->add( 'hidebots', $wgUser->getBoolOption( 'rc_hidebots' ) ); + $opts->add( 'hidebots', true ); $opts->add( 'hideanons', false ); $opts->add( 'hideliu', false ); $opts->add( 'hidepatrolled', $wgUser->getBoolOption( 'hidepatrolled' ) ); - $opts->add( 'hidemyself', $wgUser->getBoolOption( 'rc_hideown' ) ); + $opts->add( 'hidemyself', false ); $opts->add( 'namespace', '', FormOptions::INTNULL ); $opts->add( 'invert', false ); diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index 36686f92e6..e3d3b97d42 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -327,12 +327,8 @@ $messages = array( 'tog-highlightbroken' => 'Links auf nicht vorhandene Seiten hervorheben Beispiel (Alternative: wie dieser?)', 'tog-justify' => 'Text als Blocksatz', 'tog-hideminor' => 'Kleine Änderungen ausblenden', -'tog-rc_hidebots' => 'Änderungen der Bots ausblenden', -'tog-newpageshidebots' => 'Änderungen der Bots auf der Liste „Neue Seiten“ verbergen', 'tog-hidepatrolled' => 'Kontrollierte Änderungen in den „Letzten Änderungen“ ausblenden', 'tog-newpageshidepatrolled' => 'Kontrollierte Seiten auf der Liste „Neue Seiten“ verbergen', -'tog-rc_hideown' => 'Eigene Änderungen in den „Letzten Änderungen“ ausblenden', -'tog-newpageshideown' => 'Eigene Änderungen in der Liste „Neue Seiten“ verbergen', 'tog-extendwatchlist' => 'Erweiterte Beobachtungsliste zur Anzeige aller Änderungen', 'tog-usenewrc' => 'Erweiterte Darstellung (benötigt JavaScript)', 'tog-numberheadings' => 'Überschriften automatisch nummerieren', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 3d9fc59f23..06142f894a 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -499,12 +499,8 @@ XHTML id names. 'tog-highlightbroken' => 'Format broken links like this (alternative: like this?)', 'tog-justify' => 'Justify paragraphs', 'tog-hideminor' => 'Hide minor edits in recent changes', -'tog-rc_hidebots' => 'Hide bot edits in recent changes', -'tog-newpageshidebots' => 'Hide bot edits from new page list', 'tog-hidepatrolled' => 'Hide patrolled edits in recent changes', 'tog-newpageshidepatrolled' => 'Hide patrolled pages from new page list', -'tog-rc_hideown' => 'Hide my own edits in recent changes', -'tog-newpageshideown' => 'Hide my own edits from new page list', 'tog-extendwatchlist' => 'Expand watchlist to show all changes, not just the most recent', 'tog-usenewrc' => 'Enhanced recent changes (requires JavaScript)', 'tog-numberheadings' => 'Auto-number headings', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 9ba6fe465f..21b8b0c14a 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -16,12 +16,8 @@ $wgMessageStructure = array( 'tog-highlightbroken', 'tog-justify', 'tog-hideminor', - 'tog-rc_hidebots', - 'tog-newpageshidebots', 'tog-hidepatrolled', 'tog-newpageshidepatrolled', - 'tog-rc_hideown', - 'tog-newpageshideown', 'tog-extendwatchlist', 'tog-usenewrc', 'tog-numberheadings',