Changeset 20088 for trunk/wp-includes/functions.php

Timestamp:

03/02/2012 09:07:31 PM (14 years ago)

Author:

nacin

Message:

Use array_combine() in get_file_data() and avoid variable variables when an array is just fine. fixes #20126.

File:

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

trunk/wp-includes/functions.php

@@ -3373 +3373 @@
     fclose( $fp );
 
-    if ( $context != '' ) {
-        $extra_headers = apply_filters( "extra_{$context}_headers", array() );
-
-        $extra_headers = array_flip( $extra_headers );
-        foreach( $extra_headers as $key=>$value ) {
-            $extra_headers[$key] = $key;
-        }
+    if ( $context && $extra_headers = apply_filters( "extra_{$context}_headers", array() ) ) {
+        $extra_headers = array_combine( $extra_headers, $extra_headers ); // keys equal values
         $all_headers = array_merge( $extra_headers, (array) $default_headers );
     } else {
@@ -3386 +3381 @@
 
     foreach ( $all_headers as $field => $regex ) {
-        preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, ${$field});
-        if ( !empty( ${$field} ) )
-            ${$field} = _cleanup_header_comment( ${$field}[1] );
+        if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
+            $all_headers[ $field ] = _cleanup_header_comment( $match[1] );
         else
-            ${$field} = '';
-    }
-
-    $file_data = compact( array_keys( $all_headers ) );
-
-    return $file_data;
+            $all_headers[ $field ] = '';
+    }
+
+    return $all_headers;
 }