Changeset 25990 for trunk/src/wp-includes/functions.php

Timestamp:

10/29/2013 10:43:08 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Remove incorrect @return value from status_header(). Rename some variables for clarity.

props tivnet for initial patch.
fixes #25451.

File:

• trunk/src/wp-includes/functions.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -895 +895 @@
  *
  * @since 2.0.0
- * @uses apply_filters() Calls 'status_header' on status header string, HTTP
- *      HTTP code, HTTP code description, and protocol string as separate
- *      parameters.
- *
- * @param int $header HTTP status code
- * @return unknown
- */
-function status_header( $header ) {
-    $text = get_status_header_desc( $header );
-
-    if ( empty( $text ) )
-        return false;
-
-    $protocol = $_SERVER["SERVER_PROTOCOL"];
+ * @see get_status_header_desc()
+ *
+ * @param int $code HTTP status code.
+ */
+function status_header( $code ) {
+    $description = get_status_header_desc( $code );
+
+    if ( empty( $description ) )
+        return;
+
+    $protocol = $_SERVER['SERVER_PROTOCOL'];
     if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
         $protocol = 'HTTP/1.0';
-    $status_header = "$protocol $header $text";
+    $status_header = "$protocol $code $description";
     if ( function_exists( 'apply_filters' ) )
-        $status_header = apply_filters( 'status_header', $status_header, $header, $text, $protocol );
-
-    return @header( $status_header, true, $header );
+        $status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+
+    @header( $status_header, true, $code );
 }
 
@@ -926 +923 @@
  * @since 2.8.0
  *
- * @uses apply_filters()
  * @return array The associative array of header names and field values.
  */
@@ -950 +946 @@
  *
  * @since 2.0.0
- * @uses wp_get_nocache_headers()
+ * @see wp_get_nocache_headers()
  */
 function nocache_headers() {