Changeset 21471

Timestamp:

08/08/2012 06:13:48 AM (6 years ago)

Author:

nacin

Message:

Introduce wpdb::get_charset_collate() to return the DEFAULT CHARACTER SET and COLLATE for use in table schemas.

props simonwheatley, pento. fixes #18451.

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -18 +18 @@
  * @name $charset_collate
  */
-$charset_collate = '';
-
-if ( ! empty( $wpdb->charset ) )
-    $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-if ( ! empty( $wpdb->collate ) )
-    $charset_collate .= " COLLATE $wpdb->collate";
+$charset_collate = $wpdb->get_charset_collate();
 
 /**

trunk/wp-includes/wp-db.php

@@ -1561 +1561 @@
 
     /**
+     * The database character collate.
+     *
+     * @since 3.5.0
+     *
+     * @return string The database character collate.
+     */
+    public function get_charset_collate() {
+        $charset_collate = '';
+
+        if ( ! empty( $this->charset ) )
+            $charset_collate = "DEFAULT CHARACTER SET $this->charset";
+        if ( ! empty( $this->collate ) )
+            $charset_collate .= " COLLATE $this->collate";
+
+        return $charset_collate;
+    }
+
+    /**
      * Determine if a database supports a particular feature
      *