MediaWiki 1.15.0

[autoinstallsdev/mediawiki.git] / includes / WebRequest.php

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 467471250d1204833d8dd90f64ba8f4ddcba704a..0928e4d51df8c3aba91d6a554e043a8de964fcea 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -231,6 +231,7 @@ class WebRequest {
                        $data = $this->normalizeUnicode( $data );
                        return $data;
                } else {
+                       taint( $default );
                        return $default;
                }
        }
@@ -251,7 +252,7 @@ class WebRequest {
                        $val = $default;
                }
                if( is_null( $val ) ) {
-                       return null;
+                       return $val;
                } else {
                        return (string)$val;
                }