<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3350] branches/1.2/bp-forums/bp-forums-bbpress.php:
Fixes bbPress DB installation to use BBDB_CHARSET.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3350</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-04 23:05:23 +0000 (Thu, 04 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes bbPress DB installation to use BBDB_CHARSET. Fixes #1445. (branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpforumsbpforumsbbpressphp">branches/1.2/bp-forums/bp-forums-bbpress.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpforumsbpforumsbbpressphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-forums/bp-forums-bbpress.php (3349 => 3350)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-forums/bp-forums-bbpress.php 2010-11-04 23:05:06 UTC (rev 3349)
+++ branches/1.2/bp-forums/bp-forums-bbpress.php 2010-11-04 23:05:23 UTC (rev 3350)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> function bp_forums_load_bbpress() {
</span><span class="cx"> global $bp, $wpdb, $wp_roles, $current_user, $wp_users_object;
</span><span class="cx"> global $bb, $bbdb, $bb_table_prefix, $bb_current_user;
</span><span class="lines">@@ -139,6 +138,62 @@
</span><span class="cx"> * extend it and use this.
</span><span class="cx"> */
</span><span class="cx"> class BPDB extends WPDB {
</span><ins>+ var $db_servers = array();
+
+ function BPDB( $dbuser, $dbpassword, $dbname, $dbhost ) {
+ parent::WPDB( $dbuser, $dbpassword, $dbname, $dbhost );
+
+ $args = func_get_args();
+ $args = call_user_func_array( array( &$this, '_init' ), $args );
+
+ if ( $args['host'] )
+ $this->db_servers['dbh_global'] = $args;
+ }
+
+ /**
+ * Determine if a database supports a particular feature.
+ *
+ * Overriden here to work around differences between bbPress', and WordPress', implementation differences.
+ * In particular, when BuddyPress tries to run bbPress' SQL installation script, the collation check always
+ * failed. The capability is long supported by WordPress' minimum required MySQL version, so this is safe.
+ */
+ function has_cap( $db_cap, $_table_name='' ) {
+ if ( 'collation' == $db_cap )
+ return true;
+
+ return parent::has_cap( $db_cap );
+ }
+
+ /**
+ * Initialises the class variables based on provided arguments.
+ * Based on, and taken from, the BackPress class in turn taken from the 1.0 branch of bbPress.
+ */
+ function _init( $args )
+ {
+ if ( 4 == func_num_args() ) {
+ $args = array(
+ 'user' => $args,
+ 'password' => func_get_arg( 1 ),
+ 'name' => func_get_arg( 2 ),
+ 'host' => func_get_arg( 3 ),
+ 'charset' => defined( 'BBDB_CHARSET' ) ? BBDB_CHARSET : false,
+ 'collate' => defined( 'BBDB_COLLATE' ) ? BBDB_COLLATE : false,
+ );
+ }
+
+ $defaults = array(
+ 'user' => false,
+ 'password' => false,
+ 'name' => false,
+ 'host' => 'localhost',
+ 'charset' => false,
+ 'collate' => false,
+ 'errors' => false
+ );
+
+ return wp_parse_args( $args, $defaults );
+ }
+
</ins><span class="cx"> function escape_deep( $data ) {
</span><span class="cx"> if ( is_array( $data ) ) {
</span><span class="cx"> foreach ( (array) $data as $k => $v ) {
</span><span class="lines">@@ -169,7 +224,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>