Ticket #11909: wp-db.diff

wp-includes/wp-db.php

@@ -370 +370 @@
                 if ( WP_DEBUG )
                         $this->show_errors();
 
-                if( is_multisite() ) {
-                        $this->charset = 'utf8';
-                        if( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' ) {
-                                $this->collate = constant( 'DB_COLLATE' );
-                        } else {
-                                $this->collate = 'utf8_general_ci';
-                        }
-                }
+                if( function_exists( 'is_multiside' ) && is_multisite() ) {
+                                $this->charset = 'utf8';
+                                if( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' ) {
+                                                $this->collate = constant( 'DB_COLLATE' );
+                                } else {
+                                                $this->collate = 'utf8_general_ci';
+                                }
+                }
 
                 if ( defined('DB_CHARSET') )
                         $this->charset = DB_CHARSET;