Changeset 38440

Timestamp:

08/30/2016 07:16:36 AM (10 years ago)

Author:

pento

Message:

Database: Ensure that variables are defined correctly.

There were some cases where some local variables in wpdb::init_charset() could be undefined when they were used.

Merge of [38439] to the 4.6 branch.

Props Frozzare.
Fixes #37683.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (1 diff)

branches/4.6/src/wp-includes/wp-db.php

@@ -735 +735 @@
          */
         public function init_charset() {
+                $charset = '';
+                $collate = '';
+
                 if ( function_exists('is_multisite') && is_multisite() ) {
                         $charset = 'utf8';