X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=fa8f84d6971306ac5809439e339156921b485e4f;hb=d3da5e08d35f;hp=26e2d455d88e0cb09617cf68cdc2924df2302a42;hpb=f5cd97efc7b6706b3adff737d6ca55c084729277;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 26e2d455d8..fa8f84d697 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -269,6 +269,8 @@ class WebRequest {
 	 * @since 1.27
 	 */
 	public static function getRequestId() {
+		// This method is called from various error handlers and should be kept simple.
+
 		if ( !self::$reqId ) {
 			self::$reqId = isset( $_SERVER['UNIQUE_ID'] )
 				? $_SERVER['UNIQUE_ID'] : wfRandomString( 24 );
@@ -430,7 +432,7 @@ class WebRequest {
 	 * selected by a drop-down menu). For freeform input, see getText().
 	 *
 	 * @param string $name
-	 * @param string $default Optional default (or null)
+	 * @param string|null $default Optional default (or null)
 	 * @return string|null
 	 */
 	public function getVal( $name, $default = null ) {
@@ -780,6 +782,8 @@ class WebRequest {
 	 * @return string
 	 */
 	public static function getGlobalRequestURL() {
+		// This method is called on fatal errors; it should not depend on anything complex.
+
 		if ( isset( $_SERVER['REQUEST_URI'] ) && strlen( $_SERVER['REQUEST_URI'] ) ) {
 			$base = $_SERVER['REQUEST_URI'];
 		} elseif ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] )