Changeset 6104

Timestamp:

09/13/2007 04:48:41 AM (19 years ago)

Author:

markjaquith

Message:

Move $wp_header_to_desc array to get_status_header_desc() so that it can be called before vars.php is loaded.

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• vars.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -738 +738 @@
 
         $code = (int) $code;
+
+        if ( !isset($wp_header_to_desc) ) {
+                $wp_header_to_desc = array(
+                        100 => 'Continue',
+                        101 => 'Switching Protocols',
+
+                        200 => 'OK',
+                        201 => 'Created',
+                        202 => 'Accepted',
+                        203 => 'Non-Authoritative Information',
+                        204 => 'No Content',
+                        205 => 'Reset Content',
+                        206 => 'Partial Content',
+
+                        300 => 'Multiple Choices',
+                        301 => 'Moved Permanently',
+                        302 => 'Found',
+                        303 => 'See Other',
+                        304 => 'Not Modified',
+                        305 => 'Use Proxy',
+                        307 => 'Temporary Redirect',
+
+                        400 => 'Bad Request',
+                        401 => 'Unauthorized',
+                        403 => 'Forbidden',
+                        404 => 'Not Found',
+                        405 => 'Method Not Allowed',
+                        406 => 'Not Acceptable',
+                        407 => 'Proxy Authentication Required',
+                        408 => 'Request Timeout',
+                        409 => 'Conflict',
+                        410 => 'Gone',
+                        411 => 'Length Required',
+                        412 => 'Precondition Failed',
+                        413 => 'Request Entity Too Large',
+                        414 => 'Request-URI Too Long',
+                        415 => 'Unsupported Media Type',
+                        416 => 'Requested Range Not Satisfiable',
+                        417 => 'Expectation Failed',
+
+                        500 => 'Internal Server Error',
+                        501 => 'Not Implemented',
+                        502 => 'Bad Gateway',
+                        503 => 'Service Unavailable',
+                        504 => 'Gateway Timeout',
+                        505 => 'HTTP Version Not Supported'
+                );
+        }
 
         if ( isset( $wp_header_to_desc[$code] ) ) {

trunk/wp-includes/vars.php

@@ -45 +45 @@
 $is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false) ? true : false;
 
-$wp_header_to_desc = array(
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported'
-);
-
 ?>