dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Change mw-ui anchors to require mw-ui-anchor base class, and introduce mw...
[lhc/web/wiklou.git]
/
includes
/
specialpage
/
RedirectSpecialPage.php
diff --git
a/includes/specialpage/RedirectSpecialPage.php
b/includes/specialpage/RedirectSpecialPage.php
index
3bdbc3c
..
4226ee0
100644
(file)
--- a/
includes/specialpage/RedirectSpecialPage.php
+++ b/
includes/specialpage/RedirectSpecialPage.php
@@
-71,10
+71,13
@@
abstract class RedirectSpecialPage extends UnlistedSpecialPage {
*/
public function getRedirectQuery() {
$params = array();
*/
public function getRedirectQuery() {
$params = array();
+ $request = $this->getRequest();
foreach ( $this->mAllowedRedirectParams as $arg ) {
foreach ( $this->mAllowedRedirectParams as $arg ) {
- if ( $this->getRequest()->getVal( $arg, null ) !== null ) {
- $params[$arg] = $this->getRequest()->getVal( $arg );
+ if ( $request->getVal( $arg, null ) !== null ) {
+ $params[$arg] = $request->getVal( $arg );
+ } elseif ( $request->getArray( $arg, null ) !== null ) {
+ $params[$arg] = $request->getArray( $arg );
}
}
}
}
@@
-153,10
+156,6
@@
abstract class SpecialRedirectToSpecial extends RedirectSpecialPage {
* preference, useful for preloaded edits where you know preview wouldn't be
* useful.
*
* preference, useful for preloaded edits where you know preview wouldn't be
* useful.
*
- * - internaledit, externaledit, mode: Allows forcing the use of the
- * internal/external editor, e.g. to force the internal editor for
- * short/simple preloaded edits.
- *
* - redlink: Affects the message the user sees if their talk page/user talk
* page does not currently exist. Avoids confusion for newbies with no user
* pages over why they got a "permission error" following this link:
* - redlink: Affects the message the user sees if their talk page/user talk
* page does not currently exist. Avoids confusion for newbies with no user
* pages over why they got a "permission error" following this link:
@@
-192,9
+191,9
@@
abstract class RedirectSpecialArticle extends RedirectSpecialPage {
'action',
'redirect', 'rdfrom',
# Options for preloaded edits
'action',
'redirect', 'rdfrom',
# Options for preloaded edits
- 'preload', 'editintro', 'preloadtitle', 'summary', 'nosummary',
+ 'preload', '
preloadparams', '
editintro', 'preloadtitle', 'summary', 'nosummary',
# Options for overriding user settings
# Options for overriding user settings
- 'preview', '
internaledit', 'externaledit', 'mode', '
minor', 'watchthis',
+ 'preview', 'minor', 'watchthis',
# Options for history/diffs
'section', 'oldid', 'diff', 'dir',
'limit', 'offset', 'feed',
# Options for history/diffs
'section', 'oldid', 'diff', 'dir',
'limit', 'offset', 'feed',