Ticket #745: 745.diff

bb-includes/classes.php

@@ -285 +285 @@
-
-                        $fields .= ", MIN(p.post_id) as post_id";
-
+
+                        if ( defined('BB_MYSQLI') && BB_MYSQLI )
+                                $mysql_version = mysqli_get_client_info();
+                        else
+                                $mysql_version = mysql_get_client_info();
+
-                        // GROUP_CONCAT requires MySQL >= 4.1
-mysql_get_client_info()
+$mysql_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 );
-
-_get_server_info(
+i_get_server_info($this->$dbhname
-                        $this->query("SET NAMES '$this->charset'");
-
-                $this->select( $server->database, $this->$dbhname );

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);

bb-admin/upgrade-schema.php

@@ -2 +2 @@
-global $bb_queries, $bbdb;
-
-$charset_collate = '';
+$user_charset_collate = '';
-
-
+
+
+
+
+
+
+
+
+
+
-        if ( ! empty($bbdb->charset) )
-                $charset_collate = "DEFAULT CHARACTER SET $bbdb->charset";
-        if ( ! empty($bbdb->collate) )
-                $charset_collate .= " COLLATE $bbdb->collate";
-}
-
+if ( version_compare($mysql_user_db_version, '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 +96 @@
-  display_name varchar(250) NOT NULL default '',
-  PRIMARY KEY  (ID),
-  UNIQUE KEY user_login (user_login)
-
+user_
-CREATE TABLE $bbdb->usermeta (
-  umeta_id bigint(20) NOT NULL auto_increment,
-  user_id bigint(20) NOT NULL default '0',
@@ -88 +105 @@
-  PRIMARY KEY  (umeta_id),
-  KEY user_id (user_id),
-  KEY meta_key (meta_key)
-
+user_
-CREATE TABLE $bbdb->tags (
-  tag_id bigint(20) unsigned NOT NULL auto_increment,
-  tag varchar(200) NOT NULL default '',