Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't redirect to the canonical title if other parameters have been passed in $_GET

Browse source
This commit is contained in:
Tim Starling 2004-07-25 11:49:05 +00:00
parent 7abb986676
commit 629601a5dc
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/WebRequest.php
View file

@ -117,6 +117,10 @@ class WebRequest {
function getValues() {
$names = func_get_args();
if ( count( $names ) == 0 ) {
$names = array_keys( $_REQUEST );
}
$retVal = array();
foreach ( $names as $name ) {
$value = $this->getVal( $name );

4
index.php
View file

@ -74,7 +74,9 @@ if ( $search = $wgRequest->getText( 'search' ) ) {
$wgTitle = Title::newFromText( wfMsg( "badtitle" ) );
$wgOut->errorpage( "badtitle", "badtitletext" );
}
} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title ) {
} else if ( ( $action == "view" ) && $wgTitle->getPrefixedDBKey() != $title &&
!count( array_diff( array_keys( $_GET ), array( 'action', 'title' ) ) ) )
{
/* redirect to canonical url, make it a 301 to allow caching */
$wgOut->redirect( $wgTitle->getFullURL(), '301');
} else if ( Namespace::getSpecial() == $wgTitle->getNamespace() ) {