| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1363,6 +1363,7 @@ |
| 1364 | 1364 | 'newpages', |
| 1365 | 1365 | 'newpages-summary', |
| 1366 | 1366 | 'newpages-username', |
| | 1367 | + 'newpages-showhideredirs', |
| 1367 | 1368 | 'ancientpages', |
| 1368 | 1369 | 'ancientpages-summary', |
| 1369 | 1370 | 'move', |
| Index: trunk/phase3/CREDITS |
| — | — | @@ -58,6 +58,7 @@ |
| 59 | 59 | * Mormegil |
| 60 | 60 | * Nathaniel Herman |
| 61 | 61 | * Nathan Larson |
| | 62 | +* Paul Copperman |
| 62 | 63 | * RememberTheDot |
| 63 | 64 | * ST47 |
| 64 | 65 | |
| Index: trunk/phase3/includes/specials/SpecialNewpages.php |
| — | — | @@ -26,6 +26,7 @@ |
| 27 | 27 | $opts->add( 'hideliu', false ); |
| 28 | 28 | $opts->add( 'hidepatrolled', false ); |
| 29 | 29 | $opts->add( 'hidebots', false ); |
| | 30 | + $opts->add( 'hideredirs', true ); |
| 30 | 31 | $opts->add( 'limit', (int)$wgUser->getOption( 'rclimit' ) ); |
| 31 | 32 | $opts->add( 'offset', '' ); |
| 32 | 33 | $opts->add( 'namespace', '0' ); |
| — | — | @@ -58,6 +59,8 @@ |
| 59 | 60 | $this->opts->setValue( 'hidepatrolled', true ); |
| 60 | 61 | if ( 'hidebots' == $bit ) |
| 61 | 62 | $this->opts->setValue( 'hidebots', true ); |
| | 63 | + if ( 'showredirs' == $bit ) |
| | 64 | + $this->opts->setValue( 'hideredirs', false ); |
| 62 | 65 | if ( is_numeric( $bit ) ) |
| 63 | 66 | $this->opts->setValue( 'limit', intval( $bit ) ); |
| 64 | 67 | |
| — | — | @@ -125,7 +128,8 @@ |
| 126 | 129 | $filters = array( |
| 127 | 130 | 'hideliu' => 'rcshowhideliu', |
| 128 | 131 | 'hidepatrolled' => 'rcshowhidepatr', |
| 129 | | - 'hidebots' => 'rcshowhidebots' |
| | 132 | + 'hidebots' => 'rcshowhidebots', |
| | 133 | + 'hideredirs' => 'newpages-showhideredirs' |
| 130 | 134 | ); |
| 131 | 135 | |
| 132 | 136 | // Disable some if needed |
| — | — | @@ -142,8 +146,8 @@ |
| 143 | 147 | $self = $this->getTitle(); |
| 144 | 148 | foreach ( $filters as $key => $msg ) { |
| 145 | 149 | $onoff = 1 - $this->opts->getValue($key); |
| 146 | | - $link = $this->skin->makeKnownLinkObj( $self, $showhide[$onoff], |
| 147 | | - wfArrayToCGI( array( $key => $onoff ), $changed ) |
| | 150 | + $link = $this->skin->link( $self, $showhide[$onoff], array(), |
| | 151 | + array( $key => $onoff ) + $changed |
| 148 | 152 | ); |
| 149 | 153 | $links[$key] = wfMsgHtml( $msg, $link ); |
| 150 | 154 | } |
| — | — | @@ -348,8 +352,6 @@ |
| 349 | 353 | // Stored opts |
| 350 | 354 | protected $opts, $mForm; |
| 351 | 355 | |
| 352 | | - private $hideliu, $hidepatrolled, $hidebots, $namespace, $user, $spTitle; |
| 353 | | - |
| 354 | 356 | function __construct( $form, FormOptions $opts ) { |
| 355 | 357 | parent::__construct(); |
| 356 | 358 | $this->mForm = $form; |
| — | — | @@ -381,7 +383,7 @@ |
| 382 | 384 | $rcIndexes = array( 'rc_timestamp' ); |
| 383 | 385 | } |
| 384 | 386 | $conds[] = 'page_id = rc_cur_id'; |
| 385 | | - $conds['page_is_redirect'] = 0; |
| | 387 | + |
| 386 | 388 | # $wgEnableNewpagesUserFilter - temp WMF hack |
| 387 | 389 | if( $wgEnableNewpagesUserFilter && $user ) { |
| 388 | 390 | $conds['rc_user_text'] = $user->getText(); |
| — | — | @@ -398,6 +400,10 @@ |
| 399 | 401 | $conds['rc_bot'] = 0; |
| 400 | 402 | } |
| 401 | 403 | |
| | 404 | + if ( $this->opts->getValue( 'hideredirs' ) ) { |
| | 405 | + $conds['page_is_redirect'] = 0; |
| | 406 | + } |
| | 407 | + |
| 402 | 408 | return array( |
| 403 | 409 | 'tables' => array( 'recentchanges', 'page' ), |
| 404 | 410 | 'fields' => 'rc_namespace,rc_title, rc_cur_id, rc_user,rc_user_text,rc_comment, |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2095,6 +2095,7 @@ |
| 2096 | 2096 | 'newpages' => 'New pages', |
| 2097 | 2097 | 'newpages-summary' => '', # do not translate or duplicate this message to other languages |
| 2098 | 2098 | 'newpages-username' => 'Username:', |
| | 2099 | +'newpages-showhideredirs' => '$1 redirects', |
| 2099 | 2100 | 'ancientpages' => 'Oldest pages', |
| 2100 | 2101 | 'ancientpages-summary' => '', # do not translate or duplicate this message to other languages |
| 2101 | 2102 | 'move' => 'Move', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -188,6 +188,7 @@ |
| 189 | 189 | * (bug 13710) Allow to force "watch this" checkbox via URL using para "watchthis" |
| 190 | 190 | * (bug 15125) Add Public Domain to default options when installing. Patch by Nathan Larson. |
| 191 | 191 | * Set a special temporary directory for ImageMagick with $wgImageMagickTempDir |
| | 192 | +* (bug 16113) Show/hide for redirects in Special:NewPages |
| 192 | 193 | |
| 193 | 194 | === Bug fixes in 1.14 === |
| 194 | 195 | |