From b0f05715e9805a5a369718ffecc12cd790618f5c Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 16 Jun 2010 19:28:01 +0000 Subject: [PATCH] Make dbh parameter to select optional for plugin back compat. Don't pass by ref to preserve PHP 4 support. fixes #13914 git-svn-id: http://svn.automattic.com/wordpress/trunk@15266 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/wp-db.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index d3ea6f33a..6630efcf3 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -733,9 +733,13 @@ class wpdb { * @since 0.71 * * @param string $db MySQL database name + * @param resource $dbh Optional link identifier. * @return null Always null. */ - function select( $db, &$dbh ) { + function select( $db, $dbh = null) { + if ( is_null($dbh) ) + $dbh = $this->dbh; + if ( !@mysql_select_db( $db, $dbh ) ) { $this->ready = false; $this->bail( sprintf( /*WP_I18N_DB_SELECT_DB*/'