Changeset 27377

Timestamp:

03/03/2014 05:35:12 PM (11 years ago)

Author:

nacin

Message:

Make OBJECT a case sensitive constant, for HHVM compatibility and general sanity.

Support object explicitly, and other forms using a fallback in wpdb.

fixes #27231.

File:

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

trunk/src/wp-includes/wp-db.php

@@ -18 +18 @@
  * @since 0.71
  */
-define( 'OBJECT', 'OBJECT', true );
+define( 'OBJECT', 'OBJECT' );
+define( 'object', 'OBJECT' ); // Back compat.
 
 /**
@@ -1822 +1823 @@
         } elseif ( $output == ARRAY_N ) {
             return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null;
+        } elseif ( strtoupper( $output ) === OBJECT ) {
+            // Back compat for OBJECT being previously case insensitive.
+            return $this->last_result[$y] ? $this->last_result[$y] : null;
         } else {
             $this->print_error( " \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N" );
@@ -1901 +1905 @@
             }
             return $new_array;
+        } elseif ( strtoupper( $output ) === OBJECT ) {
+            // Back compat for OBJECT being previously case insensitive.
+            return $this->last_result;
         }
         return null;