<!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" />
<title>[BuddyPress][5117] trunk/bp-forums/bp-forums-bbpress-sa.php: Make the BPDB class pluggable, for better support by db.php plugins like SharDB.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5117">5117</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-09-07 13:24:00 +0000 (Wed, 07 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the BPDB class pluggable, for better support by db.php plugins like SharDB. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3549">#3549</a>. Props wpmuguru</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumsbbpresssaphp">trunk/bp-forums/bp-forums-bbpress-sa.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumsbbpresssaphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-bbpress-sa.php (5116 => 5117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-bbpress-sa.php 2011-09-07 12:30:58 UTC (rev 5116)
+++ trunk/bp-forums/bp-forums-bbpress-sa.php 2011-09-07 13:24:00 UTC (rev 5117)
</span><span class="lines">@@ -135,71 +135,77 @@
</span><span class="cx"> /**
</span><span class="cx"> * bbPress needs the DB class to be BPDB, but we want to use WPDB, so we can
</span><span class="cx"> * extend it and use this.
</span><ins>+ *
+ * The class is pluggable, so that plugins that swap out WPDB with a custom
+ * database class (such as HyperDB and SharDB) can provide their own versions
+ * of BPDB which extend the appropriate base class.
</ins><span class="cx"> */
</span><del>-class BPDB extends WPDB {
- var $db_servers = array();
</del><ins>+if ( ! class_exists( 'BPDB' ) ) :
+ class BPDB extends WPDB {
+ var $db_servers = array();
</ins><span class="cx">
</span><del>- function BPDB( $dbuser, $dbpassword, $dbname, $dbhost ) {
- $this->__construct( $dbuser, $dbpassword, $dbname, $dbhost );
- }
</del><ins>+ function BPDB( $dbuser, $dbpassword, $dbname, $dbhost ) {
+ $this->__construct( $dbuser, $dbpassword, $dbname, $dbhost );
+ }
</ins><span class="cx">
</span><del>- function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
- parent::__construct( $dbuser, $dbpassword, $dbname, $dbhost );
</del><ins>+ function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
+ parent::__construct( $dbuser, $dbpassword, $dbname, $dbhost );
</ins><span class="cx">
</span><del>- $args = func_get_args();
- $args = call_user_func_array( array( &$this, 'init' ), $args );
</del><ins>+ $args = func_get_args();
+ $args = call_user_func_array( array( &$this, 'init' ), $args );
</ins><span class="cx">
</span><del>- if ( $args['host'] )
- $this->db_servers['dbh_global'] = $args;
- }
</del><ins>+ if ( $args['host'] )
+ $this->db_servers['dbh_global'] = $args;
+ }
</ins><span class="cx">
</span><del>- /**
- * 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;
</del><ins>+ /**
+ * 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;
</ins><span class="cx">
</span><del>- 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,
- );
</del><ins>+ return parent::has_cap( $db_cap );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $defaults = array(
- 'user' => false,
- 'password' => false,
- 'name' => false,
- 'host' => 'localhost',
- 'charset' => false,
- 'collate' => false,
- 'errors' => false
- );
</del><ins>+ /**
+ * 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,
+ );
+ }
</ins><span class="cx">
</span><del>- return wp_parse_args( $args, $defaults );
- }
</del><ins>+ $defaults = array(
+ 'user' => false,
+ 'password' => false,
+ 'name' => false,
+ 'host' => 'localhost',
+ 'charset' => false,
+ 'collate' => false,
+ 'errors' => false
+ );
</ins><span class="cx">
</span><del>- function escape_deep( $data ) {
- return $this->escape( $data );
</del><ins>+ return wp_parse_args( $args, $defaults );
+ }
+
+ function escape_deep( $data ) {
+ return $this->escape( $data );
+ }
</ins><span class="cx"> }
</span><del>-}
</del><ins>+endif; // class_exists( 'BPDB' )
</ins><span class="cx">
</span><span class="cx"> /* BBPress needs this function to convert vars */
</span><span class="cx"> function backpress_convert_object( &$object, $output ) {
</span><span class="lines">@@ -419,4 +425,4 @@
</span><span class="cx"> return $for_update;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>