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

* (bug 7681, 11559) Cookie values no longer override GET and POST variables.

Browse source
This commit is contained in:
Brion Vibber 2008-02-12 22:07:16 +00:00
parent d0d269d9b7
commit f849fa942c
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -383,6 +383,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
* (bug 12732) Fix installer and searching to handle built-in tsearch2 for Postgres. * (bug 12732) Fix installer and searching to handle built-in tsearch2 for Postgres.
* (bug 12784) Change "bool" types to smallint to handle Postgres 8.3 strictness. * (bug 12784) Change "bool" types to smallint to handle Postgres 8.3 strictness.
* (bug 12301) Allow maintenance/findhooks.php to search hooks in multiple directories. * (bug 12301) Allow maintenance/findhooks.php to search hooks in multiple directories.
* (bug 7681, 11559) Cookie values no longer override GET and POST variables.
== Parser changes in 1.12 == == Parser changes in 1.12 ==

24
includes/WebRequest.php
View file

@ -42,8 +42,17 @@ if ( !function_exists( '__autoload' ) ) {
* *
*/ */
class WebRequest { class WebRequest {
var $data = array();
function __construct() { function __construct() {
/// @fixme This preemtive de-quoting can interfere with other web libraries
/// and increases our memory footprint. It would be cleaner to do on
/// demand; but currently we have no wrapper for $_SERVER etc.
$this->checkMagicQuotes(); $this->checkMagicQuotes();
// POST overrides GET data
// We don't use $_REQUEST here to avoid interference from cookies...
$this->data = array_merge( $_GET, $_POST );
} }
/** /**
@ -110,7 +119,7 @@ class WebRequest {
$matches['title'] = substr( $_SERVER['PATH_INFO'], 1 ); $matches['title'] = substr( $_SERVER['PATH_INFO'], 1 );
} }
foreach( $matches as $key => $val) { foreach( $matches as $key => $val) {
$_GET[$key] = $_REQUEST[$key] = $val; $this->data[$key] = $_GET[$key] = $_REQUEST[$key] = $val;
} }
} }
} }
@ -236,7 +245,7 @@ class WebRequest {
* @return string * @return string
*/ */
function getVal( $name, $default = NULL ) { function getVal( $name, $default = NULL ) {
$val = $this->getGPCVal( $_REQUEST, $name, $default ); $val = $this->getGPCVal( $this->data, $name, $default );
if( is_array( $val ) ) { if( is_array( $val ) ) {
$val = $default; $val = $default;
} }
@ -257,7 +266,7 @@ class WebRequest {
* @return array * @return array
*/ */
function getArray( $name, $default = NULL ) { function getArray( $name, $default = NULL ) {
$val = $this->getGPCVal( $_REQUEST, $name, $default ); $val = $this->getGPCVal( $this->data, $name, $default );
if( is_null( $val ) ) { if( is_null( $val ) ) {
return null; return null;
} else { } else {
@ -362,7 +371,7 @@ class WebRequest {
function getValues() { function getValues() {
$names = func_get_args(); $names = func_get_args();
if ( count( $names ) == 0 ) { if ( count( $names ) == 0 ) {
$names = array_keys( $_REQUEST ); $names = array_keys( $this->data );
} }
$retVal = array(); $retVal = array();
@ -587,7 +596,6 @@ class WebRequest {
* *
*/ */
class FauxRequest extends WebRequest { class FauxRequest extends WebRequest {
var $data = null;
var $wasPosted = false; var $wasPosted = false;
/** /**
@ -604,13 +612,9 @@ class FauxRequest extends WebRequest {
$this->wasPosted = $wasPosted; $this->wasPosted = $wasPosted;
} }
function getVal( $name, $default = NULL ) {
return $this->getGPCVal( $this->data, $name, $default );
}
function getText( $name, $default = '' ) { function getText( $name, $default = '' ) {
# Override; don't recode since we're using internal data # Override; don't recode since we're using internal data
return $this->getVal( $name, $default ); return (string)$this->getVal( $name, $default );
} }
function getValues() { function getValues() {