From 51944287417518d4995a2b143be787f8f1a115bd Mon Sep 17 00:00:00 2001 From: dd32 Date: Tue, 18 Oct 2011 02:48:07 +0000 Subject: [PATCH] Fix Undefined Variable Notices when no charset/collate is set for $wpdb. See #12028 git-svn-id: http://svn.automattic.com/wordpress/trunk@18986 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 6a3c4fab68..8ab2e8bdcb 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -36,6 +36,8 @@ if ( ! empty( $wpdb->collate ) ) function wp_get_db_schema( $scope = 'all', $blog_id = null ) { global $wpdb; + $charset_collate = ''; + if ( ! empty($wpdb->charset) ) $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset"; if ( ! empty($wpdb->collate) )