| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -16,12 +16,8 @@ |
| 17 | 17 | 'tog-highlightbroken', |
| 18 | 18 | 'tog-justify', |
| 19 | 19 | 'tog-hideminor', |
| 20 | | - 'tog-rc_hidebots', |
| 21 | | - 'tog-newpageshidebots', |
| 22 | 20 | 'tog-hidepatrolled', |
| 23 | 21 | 'tog-newpageshidepatrolled', |
| 24 | | - 'tog-rc_hideown', |
| 25 | | - 'tog-newpageshideown', |
| 26 | 22 | 'tog-extendwatchlist', |
| 27 | 23 | 'tog-usenewrc', |
| 28 | 24 | 'tog-numberheadings', |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -53,10 +53,6 @@ |
| 54 | 54 | 'highlightbroken', |
| 55 | 55 | 'justify', |
| 56 | 56 | 'hideminor', |
| 57 | | - 'rc_hidebots', |
| 58 | | - 'rc_hideown', |
| 59 | | - 'newpageshidebots', |
| 60 | | - 'newpageshideown', |
| 61 | 57 | 'extendwatchlist', |
| 62 | 58 | 'usenewrc', |
| 63 | 59 | 'numberheadings', |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2444,7 +2444,6 @@ |
| 2445 | 2445 | 'rclimit' => 50, |
| 2446 | 2446 | 'wllimit' => 250, |
| 2447 | 2447 | 'hideminor' => 0, |
| 2448 | | - 'rc_hidebots' => 1, |
| 2449 | 2448 | 'hidepatrolled' => 0, |
| 2450 | 2449 | 'newpageshidepatrolled' => 0, |
| 2451 | 2450 | 'highlightbroken' => 1, |
| Index: trunk/phase3/includes/specials/SpecialNewpages.php |
| — | — | @@ -25,8 +25,7 @@ |
| 26 | 26 | $this->opts = $opts; // bind |
| 27 | 27 | $opts->add( 'hideliu', false ); |
| 28 | 28 | $opts->add( 'hidepatrolled', $wgUser->getBoolOption( 'newpageshidepatrolled' ) ); |
| 29 | | - $opts->add( 'hidebots', $wgUser->getBoolOption( 'newpageshidebots' ) ); |
| 30 | | - $opts->add( 'hideown', $wgUser->getBoolOption( 'newpageshideown' ) ); |
| | 29 | + $opts->add( 'hidebots', false ); |
| 31 | 30 | $opts->add( 'hideredirs', true ); |
| 32 | 31 | $opts->add( 'limit', (int)$wgUser->getOption( 'rclimit' ) ); |
| 33 | 32 | $opts->add( 'offset', '' ); |
| — | — | @@ -61,8 +60,6 @@ |
| 62 | 61 | $this->opts->setValue( 'hidepatrolled', true ); |
| 63 | 62 | if ( 'hidebots' == $bit ) |
| 64 | 63 | $this->opts->setValue( 'hidebots', true ); |
| 65 | | - if ( 'hideown' == $bit ) |
| 66 | | - $this->opts->setValue( 'hideown', true ); |
| 67 | 64 | if ( 'showredirs' == $bit ) |
| 68 | 65 | $this->opts->setValue( 'hideredirs', false ); |
| 69 | 66 | if ( is_numeric( $bit ) ) |
| — | — | @@ -135,7 +132,6 @@ |
| 136 | 133 | 'hideliu' => 'rcshowhideliu', |
| 137 | 134 | 'hidepatrolled' => 'rcshowhidepatr', |
| 138 | 135 | 'hidebots' => 'rcshowhidebots', |
| 139 | | - 'hideown' => 'rcshowhidemine', |
| 140 | 136 | 'hideredirs' => 'whatlinkshere-hideredirs' |
| 141 | 137 | ); |
| 142 | 138 | |
| — | — | @@ -391,7 +387,6 @@ |
| 392 | 388 | |
| 393 | 389 | function getQueryInfo() { |
| 394 | 390 | global $wgEnableNewpagesUserFilter, $wgGroupPermissions, $wgUser; |
| 395 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 396 | 391 | $conds = array(); |
| 397 | 392 | $conds['rc_new'] = 1; |
| 398 | 393 | |
| — | — | @@ -423,13 +418,7 @@ |
| 424 | 419 | if( $this->opts->getValue( 'hidebots' ) ) { |
| 425 | 420 | $conds['rc_bot'] = 0; |
| 426 | 421 | } |
| 427 | | - if( $this->opts->getValue( 'hideown' ) ) { |
| 428 | | - if( $wgUser->getId() ) { |
| 429 | | - $conds[] = 'rc_user != ' . $dbr->addQuotes( $wgUser->getId() ); |
| 430 | | - } else { |
| 431 | | - $conds[] = 'rc_user_text != ' . $dbr->addQuotes( $wgUser->getName() ); |
| 432 | | - } |
| 433 | | - } |
| | 422 | + |
| 434 | 423 | if ( $this->opts->getValue( 'hideredirs' ) ) { |
| 435 | 424 | $conds['page_is_redirect'] = 0; |
| 436 | 425 | } |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -1162,14 +1162,10 @@ |
| 1163 | 1163 | ); |
| 1164 | 1164 | |
| 1165 | 1165 | $toggles[] = 'hideminor'; |
| 1166 | | - $toggles[] = 'rc_hidebots'; |
| 1167 | | - $toggles[] = 'newpageshidebots'; |
| 1168 | 1166 | if( $wgUseRCPatrol ) { |
| 1169 | 1167 | $toggles[] = 'hidepatrolled'; |
| 1170 | 1168 | $toggles[] = 'newpageshidepatrolled'; |
| 1171 | 1169 | } |
| 1172 | | - $toggles[] = 'rc_hideown'; |
| 1173 | | - $toggles[] = 'newpageshideown'; |
| 1174 | 1170 | if( $wgRCShowWatchingUsers ) $toggles[] = 'shownumberswatching'; |
| 1175 | 1171 | $toggles[] = 'usenewrc'; |
| 1176 | 1172 | |
| Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -24,11 +24,11 @@ |
| 25 | 25 | $opts->add( 'from', '' ); |
| 26 | 26 | |
| 27 | 27 | $opts->add( 'hideminor', $wgUser->getBoolOption( 'hideminor' ) ); |
| 28 | | - $opts->add( 'hidebots', $wgUser->getBoolOption( 'rc_hidebots' ) ); |
| | 28 | + $opts->add( 'hidebots', true ); |
| 29 | 29 | $opts->add( 'hideanons', false ); |
| 30 | 30 | $opts->add( 'hideliu', false ); |
| 31 | 31 | $opts->add( 'hidepatrolled', $wgUser->getBoolOption( 'hidepatrolled' ) ); |
| 32 | | - $opts->add( 'hidemyself', $wgUser->getBoolOption( 'rc_hideown' ) ); |
| | 32 | + $opts->add( 'hidemyself', false ); |
| 33 | 33 | |
| 34 | 34 | $opts->add( 'namespace', '', FormOptions::INTNULL ); |
| 35 | 35 | $opts->add( 'invert', false ); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -499,12 +499,8 @@ |
| 500 | 500 | 'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>)', |
| 501 | 501 | 'tog-justify' => 'Justify paragraphs', |
| 502 | 502 | 'tog-hideminor' => 'Hide minor edits in recent changes', |
| 503 | | -'tog-rc_hidebots' => 'Hide bot edits in recent changes', |
| 504 | | -'tog-newpageshidebots' => 'Hide bot edits from new page list', |
| 505 | 503 | 'tog-hidepatrolled' => 'Hide patrolled edits in recent changes', |
| 506 | 504 | 'tog-newpageshidepatrolled' => 'Hide patrolled pages from new page list', |
| 507 | | -'tog-rc_hideown' => 'Hide my own edits in recent changes', |
| 508 | | -'tog-newpageshideown' => 'Hide my own edits from new page list', |
| 509 | 505 | 'tog-extendwatchlist' => 'Expand watchlist to show all changes, not just the most recent', |
| 510 | 506 | 'tog-usenewrc' => 'Enhanced recent changes (requires JavaScript)', |
| 511 | 507 | 'tog-numberheadings' => 'Auto-number headings', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -327,12 +327,8 @@ |
| 328 | 328 | 'tog-highlightbroken' => 'Links auf nicht vorhandene Seiten hervorheben <a href="" class="new">Beispiel</a> (Alternative: wie dieser<a href="" class="internal">?</a>)', |
| 329 | 329 | 'tog-justify' => 'Text als Blocksatz', |
| 330 | 330 | 'tog-hideminor' => 'Kleine Änderungen ausblenden', |
| 331 | | -'tog-rc_hidebots' => 'Änderungen der Bots ausblenden', |
| 332 | | -'tog-newpageshidebots' => 'Änderungen der Bots auf der Liste „Neue Seiten“ verbergen', |
| 333 | 331 | 'tog-hidepatrolled' => 'Kontrollierte Änderungen in den „Letzten Änderungen“ ausblenden', |
| 334 | 332 | 'tog-newpageshidepatrolled' => 'Kontrollierte Seiten auf der Liste „Neue Seiten“ verbergen', |
| 335 | | -'tog-rc_hideown' => 'Eigene Änderungen in den „Letzten Änderungen“ ausblenden', |
| 336 | | -'tog-newpageshideown' => 'Eigene Änderungen in der Liste „Neue Seiten“ verbergen', |
| 337 | 333 | 'tog-extendwatchlist' => 'Erweiterte Beobachtungsliste zur Anzeige aller Änderungen', |
| 338 | 334 | 'tog-usenewrc' => 'Erweiterte Darstellung (benötigt JavaScript)', |
| 339 | 335 | 'tog-numberheadings' => 'Überschriften automatisch nummerieren', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -170,8 +170,6 @@ |
| 171 | 171 | * Special:AllPages: Move hardcoded styles from code to CSS |
| 172 | 172 | * (bug 6092) Add parser function equivalents of {{REVISIONID}}, |
| 173 | 173 | {{REVISIONTIMESTAMP}} (and friends) and {{REVISIONUSER}} magic words |
| 174 | | -* (bug 7039) Show/hide bots/own edits from Recentchanges via preferences |
| 175 | | -* Show/hide bots/own edits from Newpage via preferences |
| 176 | 174 | |
| 177 | 175 | === Bug fixes in 1.15 === |
| 178 | 176 | * (bug 16968) Special:Upload no longer throws useless warnings. |