Ticket #745: 745c.diff

bb-includes/classes.php

@@ -286 +286 @@
                         $fields .= ", MIN(p.post_id) as post_id";
 
                         // GROUP_CONCAT requires MySQL >= 4.1
-                        if ( version_compare('4.1', mysql_get_client_info(), '<=') )
+                        if ( version_compare('4.1', $bbdb->db_version(), '<=') )
                                 $fields .= ", GROUP_CONCAT(p.post_text SEPARATOR ' ') AS post_text";
                         else
                                 $fields .= ", p.post_text";

bb-includes/db-mysqli.php

@@ -1 +1 @@
 <?php
 
+define('BB_MYSQLI', true);
+
 define('OBJECT', 'OBJECT', true);
 define('ARRAY_A', 'ARRAY_A', false);
 define('ARRAY_N', 'ARRAY_N', false);
@@ -77 +79 @@
                 
                 $this->$dbhname = @mysqli_connect( $server->host, $server->user, $server->pass, null, $server->port );
 
-                if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
+                if ( !empty($this->charset) && version_compare(mysqli_get_server_info($this->$dbhname), '4.1.0', '>=') )
                         $this->query("SET NAMES '$this->charset'");
 
                 $this->select( $server->database, $this->$dbhname );
@@ -87 +89 @@
                 return $this->$dbhname; 
         }
 
+        function db_version( $dbh = false ) { // table name or mysql resource
+                if ( !$dbh )
+                        $dbh = $this->forums;
+
+                if ( !is_resource( $dbh ) )
+                        $dbh = $this->db_connect( "DESCRIBE $dbh" );
+
+                return mysqli_get_server_info( $dbh );
+        }
+
         function get_table_from_query ( $q ) {
                 If( substr( $q, -1 ) == ';' )
                         $q = substr( $q, 0, -1 );

bb-includes/db.php

@@ -1 +1 @@
 <?php
 
+define('BB_MYSQLI', false);
+
 define('OBJECT', 'OBJECT', true);
 define('ARRAY_A', 'ARRAY_A', false);
 define('ARRAY_N', 'ARRAY_N', false);
@@ -80 +82 @@
                 return $this->$dbhname; 
         }
 
+        function db_version( $dbh = false ) { // table name or mysql resource
+                if ( !$dbh )
+                        $dbh = $this->forums;
+
+                if ( !is_resource( $dbh ) )
+                        $dbh = $this->db_connect( "DESCRIBE $dbh" );
+
+                return mysql_get_server_info( $dbh );
+        }
+
         function get_table_from_query ( $q ) {
                 If( substr( $q, -1 ) == ';' )
                         $q = substr( $q, 0, -1 );

bb-admin/upgrade-schema.php

@@ -2 +2 @@
 global $bb_queries, $bbdb;
 
 $charset_collate = '';
+$user_charset_collate = '';
 
-if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
+if ( !defined( 'BB_MYSQLI' ) )
+        die( __('Database class not loaded.') );
+
+if ( version_compare($bbdb->db_version(), '4.1.0', '>=') ) {
         if ( ! empty($bbdb->charset) )
                 $charset_collate = "DEFAULT CHARACTER SET $bbdb->charset";
         if ( ! empty($bbdb->collate) )
                 $charset_collate .= " COLLATE $bbdb->collate";
 }
 
+if ( version_compare($bbdb->db_version( $bbdb->users ), '4.1.0', '>=') ) {
+        if ( ! empty($bbdb->charset) )
+                $user_charset_collate = "DEFAULT CHARACTER SET $bbdb->charset";
+        if ( ! empty($bbdb->collate) )
+                $user_charset_collate .= " COLLATE $bbdb->collate";
+}
+
 $bb_queries = "CREATE TABLE $bbdb->forums (
   forum_id int(10) NOT NULL auto_increment,
   forum_name varchar(150)  NOT NULL default '',
@@ -79 +90 @@
   display_name varchar(250) NOT NULL default '',
   PRIMARY KEY  (ID),
   UNIQUE KEY user_login (user_login)
-) $charset_collate;
+) $user_charset_collate;
 CREATE TABLE $bbdb->usermeta (
   umeta_id bigint(20) NOT NULL auto_increment,
   user_id bigint(20) NOT NULL default '0',
@@ -88 +99 @@
   PRIMARY KEY  (umeta_id),
   KEY user_id (user_id),
   KEY meta_key (meta_key)
-) $charset_collate;
+) $user_charset_collate;
 CREATE TABLE $bbdb->tags (
   tag_id bigint(20) unsigned NOT NULL auto_increment,
   tag varchar(200) NOT NULL default '',