Changeset 25016 for trunk/src/wp-includes/class-http.php

Timestamp:

08/08/2013 02:43:36 AM (12 years ago)

Author:

dd32

Message:

WP_HTTP: Allow name => value pairs to be passed in to the 'cookie' parameter, simplifies plugin code when needing to specify basic cookies. Fixes #21999

File:

• trunk/src/wp-includes/class-http.php (modified) (2 diffs)

trunk/src/wp-includes/class-http.php

@@ -410 +410 @@
      * Takes the arguments for a ::request() and checks for the cookie array.
      *
-     * If it's found, then it's assumed to contain WP_Http_Cookie objects, which are each parsed
-     * into strings and added to the Cookie: header (within the arguments array). Edits the array by
-     * reference.
+     * If it's found, then it upgrades any basic name => value pairs to WP_Http_Cookie instances,
+     * which are each parsed into strings and added to the Cookie: header (within the arguments array).
+     * Edits the array by reference.
      *
      * @access public
@@ -422 +422 @@
     public static function buildCookieHeader( &$r ) {
         if ( ! empty($r['cookies']) ) {
+            // Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances
+            foreach ( $r['cookies'] as $name => $value ) {
+                if ( ! is_object( $value ) )
+                    $r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) );
+            }
+
             $cookies_header = '';
             foreach ( (array) $r['cookies'] as $cookie ) {
                 $cookies_header .= $cookie->getHeaderValue() . '; ';
             }
+
             $cookies_header = substr( $cookies_header, 0, -2 );
             $r['headers']['cookie'] = $cookies_header;