Merge "ApiTestCase: Set correct user for derivate requests"

[lhc/web/wiklou.git] / includes / GlobalFunctions.php
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php

index 6eaeb25..25876fb 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2129,15 +2129,14 @@ function wfVarDump( $var ) {
   */
  function wfHttpError( $code, $label, $desc ) {
         global $wgOut;
-       header( "HTTP/1.0 $code $label" );
-       header( "Status: $code $label" );
+       HttpStatus::header( $code );
         if ( $wgOut ) {
                 $wgOut->disable();
                 $wgOut->sendCacheControl();
         }
  
         header( 'Content-type: text/html; charset=utf-8' );
-       print "<!doctype html>" .
+       print '<!DOCTYPE html>' .
                 '<html><head><title>' .
                 htmlspecialchars( $label ) .
                 '</title></head><body><h1>' .
@@ -3353,7 +3352,7 @@ function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1,
                 // Removing leading zeros works around broken base detection code in
                 // some PHP versions (see <https://bugs.php.net/bug.php?id=50175> and
                 // <https://bugs.php.net/bug.php?id=55398>).
-               $result = gmp_strval( gmp_init( ltrim( $input, '0' ), $sourceBase ), $destBase );
+               $result = gmp_strval( gmp_init( ltrim( $input, '0' ) ?: '0', $sourceBase ), $destBase );
         } elseif ( extension_loaded( 'bcmath' ) && ( $engine == 'auto' || $engine == 'bcmath' ) ) {
                 $decimal = '0';
                 foreach ( str_split( strtolower( $input ) ) as $char ) {