<!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>[28526] trunk/src/wp-includes/wp-db.php: In `wpdb`, make some things explicitly `public`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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://core.trac.wordpress.org/changeset/28526">28526</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-19 15:35:29 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `wpdb`, make some things explicitly `public`. Do not set anything to `private`. This would instantly blow up `hyperdb` in the wild.
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>, <a href="http://core.trac.wordpress.org/ticket/22234">#22234</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/wp-db.php (28525 => 28526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/wp-db.php 2014-05-19 15:22:45 UTC (rev 28525)
+++ trunk/src/wp-includes/wp-db.php 2014-05-19 15:35:29 UTC (rev 28526)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $last_error = '';
</del><ins>+ public $last_error = '';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Amount of queries made
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var int
</span><span class="cx"> */
</span><del>- var $blogid = 0;
</del><ins>+ public $blogid = 0;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * {@internal Missing Description}}
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var int
</span><span class="cx"> */
</span><del>- var $siteid = 0;
</del><ins>+ public $siteid = 0;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of WordPress per-blog tables
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $comments;
</del><ins>+ public $comments;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Comment Metadata table
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $commentmeta;
</del><ins>+ public $commentmeta;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Links table
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $links;
</del><ins>+ public $links;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Options table
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $options;
</del><ins>+ public $options;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Post Metadata table
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $postmeta;
</del><ins>+ public $postmeta;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Posts table
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $posts;
</del><ins>+ public $posts;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Terms table
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $terms;
</del><ins>+ public $terms;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Term Relationships table
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $term_relationships;
</del><ins>+ public $term_relationships;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Term Taxonomy table
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $term_taxonomy;
</del><ins>+ public $term_taxonomy;
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Global and Multisite tables
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $usermeta;
</del><ins>+ public $usermeta;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Users table
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $users;
</del><ins>+ public $users;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Multisite Blogs table
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $blogs;
</del><ins>+ public $blogs;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Multisite Blog Versions table
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $blog_versions;
</del><ins>+ public $blog_versions;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Multisite Registration Log table
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $registration_log;
</del><ins>+ public $registration_log;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Multisite Signups table
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $signups;
</del><ins>+ public $signups;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Multisite Sites table
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $site;
</del><ins>+ public $site;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Multisite Sitewide Terms table
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $sitecategories;
</del><ins>+ public $sitecategories;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Multisite Site Metadata table
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $sitemeta;
</del><ins>+ public $sitemeta;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Format specifiers for DB columns. Columns not listed here default to %s. Initialized during WP load.
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $field_types = array();
</del><ins>+ public $field_types = array();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Database table columns charset
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $charset;
</del><ins>+ public $charset;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Database table columns collate
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $collate;
</del><ins>+ public $collate;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Database Username
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $func_call;
</del><ins>+ public $func_call;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Whether MySQL is used as the database engine.
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> * @param string $dbname MySQL database name
</span><span class="cx"> * @param string $dbhost MySQL database host
</span><span class="cx"> */
</span><del>- function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
</del><ins>+ public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
</ins><span class="cx"> register_shutdown_function( array( $this, '__destruct' ) );
</span><span class="cx">
</span><span class="cx"> if ( WP_DEBUG && WP_DEBUG_DISPLAY )
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> * @since 2.0.8
</span><span class="cx"> * @return bool true
</span><span class="cx"> */
</span><del>- function __destruct() {
</del><ins>+ public function __destruct() {
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -626,7 +626,7 @@
</span><span class="cx"> * @param string $name The private member to get, and optionally process
</span><span class="cx"> * @return mixed The private member
</span><span class="cx"> */
</span><del>- function __get( $name ) {
</del><ins>+ public function __get( $name ) {
</ins><span class="cx"> if ( 'col_info' == $name )
</span><span class="cx"> $this->load_col_info();
</span><span class="cx">
</span><span class="lines">@@ -641,7 +641,7 @@
</span><span class="cx"> * @param string $name The private member to set
</span><span class="cx"> * @param mixed $value The value to set
</span><span class="cx"> */
</span><del>- function __set( $name, $value ) {
</del><ins>+ public function __set( $name, $value ) {
</ins><span class="cx"> $this->$name = $value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -654,7 +654,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return bool If the member is set or not
</span><span class="cx"> */
</span><del>- function __isset( $name ) {
</del><ins>+ public function __isset( $name ) {
</ins><span class="cx"> return isset( $this->$name );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $name The private member to unset
</span><span class="cx"> */
</span><del>- function __unset( $name ) {
</del><ins>+ public function __unset( $name ) {
</ins><span class="cx"> unset( $this->$name );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -674,7 +674,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>- function init_charset() {
</del><ins>+ public function init_charset() {
</ins><span class="cx"> if ( function_exists('is_multisite') && is_multisite() ) {
</span><span class="cx"> $this->charset = 'utf8';
</span><span class="cx"> if ( defined( 'DB_COLLATE' ) && DB_COLLATE )
</span><span class="lines">@@ -698,7 +698,7 @@
</span><span class="cx"> * @param string $charset The character set (optional)
</span><span class="cx"> * @param string $collate The collation (optional)
</span><span class="cx"> */
</span><del>- function set_charset( $dbh, $charset = null, $collate = null ) {
</del><ins>+ public function set_charset( $dbh, $charset = null, $collate = null ) {
</ins><span class="cx"> if ( ! isset( $charset ) )
</span><span class="cx"> $charset = $this->charset;
</span><span class="cx"> if ( ! isset( $collate ) )
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param array $modes Optional. A list of SQL modes to set.
</span><span class="cx"> */
</span><del>- function set_sql_mode( $modes = array() ) {
</del><ins>+ public function set_sql_mode( $modes = array() ) {
</ins><span class="cx"> if ( empty( $modes ) ) {
</span><span class="cx"> if ( $this->use_mysqli ) {
</span><span class="cx"> $res = mysqli_query( $this->dbh, 'SELECT @@SESSION.sql_mode' );
</span><span class="lines">@@ -802,7 +802,7 @@
</span><span class="cx"> * @param bool $set_table_names Optional. Whether the table names, e.g. wpdb::$posts, should be updated or not.
</span><span class="cx"> * @return string|WP_Error Old prefix or WP_Error on error
</span><span class="cx"> */
</span><del>- function set_prefix( $prefix, $set_table_names = true ) {
</del><ins>+ public function set_prefix( $prefix, $set_table_names = true ) {
</ins><span class="cx">
</span><span class="cx"> if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
</span><span class="cx"> return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
</span><span class="lines">@@ -841,7 +841,7 @@
</span><span class="cx"> * @param int $site_id Optional.
</span><span class="cx"> * @return string previous blog id
</span><span class="cx"> */
</span><del>- function set_blog_id( $blog_id, $site_id = 0 ) {
</del><ins>+ public function set_blog_id( $blog_id, $site_id = 0 ) {
</ins><span class="cx"> if ( ! empty( $site_id ) )
</span><span class="cx"> $this->siteid = $site_id;
</span><span class="cx">
</span><span class="lines">@@ -867,7 +867,7 @@
</span><span class="cx"> * @param int $blog_id Optional.
</span><span class="cx"> * @return string Blog prefix.
</span><span class="cx"> */
</span><del>- function get_blog_prefix( $blog_id = null ) {
</del><ins>+ public function get_blog_prefix( $blog_id = null ) {
</ins><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> if ( null === $blog_id )
</span><span class="cx"> $blog_id = $this->blogid;
</span><span class="lines">@@ -909,7 +909,7 @@
</span><span class="cx"> * @param int $blog_id Optional. The blog_id to prefix. Defaults to wpdb::$blogid. Used only when prefix is requested.
</span><span class="cx"> * @return array Table names. When a prefix is requested, the key is the unprefixed table name.
</span><span class="cx"> */
</span><del>- function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
</del><ins>+ public function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
</ins><span class="cx"> switch ( $scope ) {
</span><span class="cx"> case 'all' :
</span><span class="cx"> $tables = array_merge( $this->global_tables, $this->tables );
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> * @param resource $dbh Optional link identifier.
</span><span class="cx"> * @return null Always null.
</span><span class="cx"> */
</span><del>- function select( $db, $dbh = null ) {
</del><ins>+ public function select( $db, $dbh = null ) {
</ins><span class="cx"> if ( is_null($dbh) )
</span><span class="cx"> $dbh = $this->dbh;
</span><span class="cx">
</span><span class="lines">@@ -1079,7 +1079,7 @@
</span><span class="cx"> * @param mixed $data
</span><span class="cx"> * @return mixed
</span><span class="cx"> */
</span><del>- function escape( $data ) {
</del><ins>+ public function escape( $data ) {
</ins><span class="cx"> if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
</span><span class="cx"> _deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
</span><span class="cx"> if ( is_array( $data ) ) {
</span><span class="lines">@@ -1104,7 +1104,7 @@
</span><span class="cx"> * @param string $string to escape
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><del>- function escape_by_ref( &$string ) {
</del><ins>+ public function escape_by_ref( &$string ) {
</ins><span class="cx"> if ( ! is_float( $string ) )
</span><span class="cx"> $string = $this->_real_escape( $string );
</span><span class="cx"> }
</span><span class="lines">@@ -1146,7 +1146,7 @@
</span><span class="cx"> * @return null|false|string Sanitized query string, null if there is no query, false if there is an error and string
</span><span class="cx"> * if there was something to prepare
</span><span class="cx"> */
</span><del>- function prepare( $query, $args ) {
</del><ins>+ public function prepare( $query, $args ) {
</ins><span class="cx"> if ( is_null( $query ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1177,7 +1177,7 @@
</span><span class="cx"> * @param string $str The error to display
</span><span class="cx"> * @return bool False if the showing of errors is disabled.
</span><span class="cx"> */
</span><del>- function print_error( $str = '' ) {
</del><ins>+ public function print_error( $str = '' ) {
</ins><span class="cx"> global $EZSQL_ERROR;
</span><span class="cx">
</span><span class="cx"> if ( !$str ) {
</span><span class="lines">@@ -1237,7 +1237,7 @@
</span><span class="cx"> * @param bool $show Whether to show or hide errors
</span><span class="cx"> * @return bool Old value for showing errors.
</span><span class="cx"> */
</span><del>- function show_errors( $show = true ) {
</del><ins>+ public function show_errors( $show = true ) {
</ins><span class="cx"> $errors = $this->show_errors;
</span><span class="cx"> $this->show_errors = $show;
</span><span class="cx"> return $errors;
</span><span class="lines">@@ -1253,7 +1253,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return bool Whether showing of errors was active
</span><span class="cx"> */
</span><del>- function hide_errors() {
</del><ins>+ public function hide_errors() {
</ins><span class="cx"> $show = $this->show_errors;
</span><span class="cx"> $this->show_errors = false;
</span><span class="cx"> return $show;
</span><span class="lines">@@ -1270,7 +1270,7 @@
</span><span class="cx"> * @param bool $suppress Optional. New value. Defaults to true.
</span><span class="cx"> * @return bool Old value
</span><span class="cx"> */
</span><del>- function suppress_errors( $suppress = true ) {
</del><ins>+ public function suppress_errors( $suppress = true ) {
</ins><span class="cx"> $errors = $this->suppress_errors;
</span><span class="cx"> $this->suppress_errors = (bool) $suppress;
</span><span class="cx"> return $errors;
</span><span class="lines">@@ -1282,7 +1282,7 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><del>- function flush() {
</del><ins>+ public function flush() {
</ins><span class="cx"> $this->last_result = array();
</span><span class="cx"> $this->col_info = null;
</span><span class="cx"> $this->last_query = null;
</span><span class="lines">@@ -1310,7 +1310,7 @@
</span><span class="cx"> * @param bool $allow_bail Optional. Allows the function to bail. Default true.
</span><span class="cx"> * @return bool True with a successful connection, false on failure.
</span><span class="cx"> */
</span><del>- function db_connect( $allow_bail = true ) {
</del><ins>+ public function db_connect( $allow_bail = true ) {
</ins><span class="cx">
</span><span class="cx"> $this->is_mysql = true;
</span><span class="cx">
</span><span class="lines">@@ -1425,7 +1425,7 @@
</span><span class="cx"> * @param bool $allow_bail Optional. Allows the function to bail. Default true.
</span><span class="cx"> * @return bool True if the connection is up.
</span><span class="cx"> */
</span><del>- function check_connection( $allow_bail = true ) {
</del><ins>+ public function check_connection( $allow_bail = true ) {
</ins><span class="cx"> if ( $this->use_mysqli ) {
</span><span class="cx"> if ( @mysqli_ping( $this->dbh ) ) {
</span><span class="cx"> return true;
</span><span class="lines">@@ -1497,7 +1497,7 @@
</span><span class="cx"> * @param string $query Database query
</span><span class="cx"> * @return int|false Number of rows affected/selected or false on error
</span><span class="cx"> */
</span><del>- function query( $query ) {
</del><ins>+ public function query( $query ) {
</ins><span class="cx"> if ( ! $this->ready )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1645,7 +1645,7 @@
</span><span class="cx"> * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
</span><span class="cx"> * @return int|false The number of rows inserted, or false on error.
</span><span class="cx"> */
</span><del>- function insert( $table, $data, $format = null ) {
</del><ins>+ public function insert( $table, $data, $format = null ) {
</ins><span class="cx"> return $this->_insert_replace_helper( $table, $data, $format, 'INSERT' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1668,7 +1668,7 @@
</span><span class="cx"> * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
</span><span class="cx"> * @return int|false The number of rows affected, or false on error.
</span><span class="cx"> */
</span><del>- function replace( $table, $data, $format = null ) {
</del><ins>+ public function replace( $table, $data, $format = null ) {
</ins><span class="cx"> return $this->_insert_replace_helper( $table, $data, $format, 'REPLACE' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1731,7 +1731,7 @@
</span><span class="cx"> * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings.
</span><span class="cx"> * @return int|false The number of rows updated, or false on error.
</span><span class="cx"> */
</span><del>- function update( $table, $data, $where, $format = null, $where_format = null ) {
</del><ins>+ public function update( $table, $data, $where, $format = null, $where_format = null ) {
</ins><span class="cx"> if ( ! is_array( $data ) || ! is_array( $where ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1780,7 +1780,7 @@
</span><span class="cx"> * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings unless otherwise specified in wpdb::$field_types.
</span><span class="cx"> * @return int|false The number of rows updated, or false on error.
</span><span class="cx"> */
</span><del>- function delete( $table, $where, $where_format = null ) {
</del><ins>+ public function delete( $table, $where, $where_format = null ) {
</ins><span class="cx"> if ( ! is_array( $where ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1819,7 +1819,7 @@
</span><span class="cx"> * @param int $y Optional. Row of value to return. Indexed from 0.
</span><span class="cx"> * @return string|null Database query result (as string), or null on failure
</span><span class="cx"> */
</span><del>- function get_var( $query = null, $x = 0, $y = 0 ) {
</del><ins>+ public function get_var( $query = null, $x = 0, $y = 0 ) {
</ins><span class="cx"> $this->func_call = "\$db->get_var(\"$query\", $x, $y)";
</span><span class="cx"> if ( $query )
</span><span class="cx"> $this->query( $query );
</span><span class="lines">@@ -1846,7 +1846,7 @@
</span><span class="cx"> * @param int $y Optional. Row to return. Indexed from 0.
</span><span class="cx"> * @return mixed Database query result in format specified by $output or null on failure
</span><span class="cx"> */
</span><del>- function get_row( $query = null, $output = OBJECT, $y = 0 ) {
</del><ins>+ public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
</ins><span class="cx"> $this->func_call = "\$db->get_row(\"$query\",$output,$y)";
</span><span class="cx"> if ( $query )
</span><span class="cx"> $this->query( $query );
</span><span class="lines">@@ -1883,7 +1883,7 @@
</span><span class="cx"> * @param int $x Optional. Column to return. Indexed from 0.
</span><span class="cx"> * @return array Database query result. Array indexed from 0 by SQL result row number.
</span><span class="cx"> */
</span><del>- function get_col( $query = null , $x = 0 ) {
</del><ins>+ public function get_col( $query = null , $x = 0 ) {
</ins><span class="cx"> if ( $query )
</span><span class="cx"> $this->query( $query );
</span><span class="cx">
</span><span class="lines">@@ -1908,7 +1908,7 @@
</span><span class="cx"> * With OBJECT_K, return an associative array of row objects keyed by the value of each row's first column's value. Duplicate keys are discarded.
</span><span class="cx"> * @return mixed Database query results
</span><span class="cx"> */
</span><del>- function get_results( $query = null, $output = OBJECT ) {
</del><ins>+ public function get_results( $query = null, $output = OBJECT ) {
</ins><span class="cx"> $this->func_call = "\$db->get_results(\"$query\", $output)";
</span><span class="cx">
</span><span class="cx"> if ( $query )
</span><span class="lines">@@ -1982,7 +1982,7 @@
</span><span class="cx"> * @param int $col_offset Optional. 0: col name. 1: which table the col's in. 2: col's max length. 3: if the col is numeric. 4: col's type
</span><span class="cx"> * @return mixed Column Results
</span><span class="cx"> */
</span><del>- function get_col_info( $info_type = 'name', $col_offset = -1 ) {
</del><ins>+ public function get_col_info( $info_type = 'name', $col_offset = -1 ) {
</ins><span class="cx"> $this->load_col_info();
</span><span class="cx">
</span><span class="cx"> if ( $this->col_info ) {
</span><span class="lines">@@ -2007,7 +2007,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return true
</span><span class="cx"> */
</span><del>- function timer_start() {
</del><ins>+ public function timer_start() {
</ins><span class="cx"> $this->time_start = microtime( true );
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -2019,7 +2019,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return float Total time spent on the query, in seconds
</span><span class="cx"> */
</span><del>- function timer_stop() {
</del><ins>+ public function timer_stop() {
</ins><span class="cx"> return ( microtime( true ) - $this->time_start );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2034,7 +2034,7 @@
</span><span class="cx"> * @param string $error_code Optional. A Computer readable string to identify the error.
</span><span class="cx"> * @return false|void
</span><span class="cx"> */
</span><del>- function bail( $message, $error_code = '500' ) {
</del><ins>+ public function bail( $message, $error_code = '500' ) {
</ins><span class="cx"> if ( !$this->show_errors ) {
</span><span class="cx"> if ( class_exists( 'WP_Error' ) )
</span><span class="cx"> $this->error = new WP_Error($error_code, $message);
</span><span class="lines">@@ -2054,7 +2054,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return WP_Error
</span><span class="cx"> */
</span><del>- function check_database_version() {
</del><ins>+ public function check_database_version() {
</ins><span class="cx"> global $wp_version, $required_mysql_version;
</span><span class="cx"> // Make sure the server has the required MySQL version
</span><span class="cx"> if ( version_compare($this->db_version(), $required_mysql_version, '<') )
</span><span class="lines">@@ -2072,7 +2072,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return bool True if collation is supported, false if version does not
</span><span class="cx"> */
</span><del>- function supports_collation() {
</del><ins>+ public function supports_collation() {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.5', 'wpdb::has_cap( \'collation\' )' );
</span><span class="cx"> return $this->has_cap( 'collation' );
</span><span class="cx"> }
</span><span class="lines">@@ -2104,7 +2104,7 @@
</span><span class="cx"> * @param string $db_cap The feature to check for.
</span><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>- function has_cap( $db_cap ) {
</del><ins>+ public function has_cap( $db_cap ) {
</ins><span class="cx"> $version = $this->db_version();
</span><span class="cx">
</span><span class="cx"> switch ( strtolower( $db_cap ) ) {
</span><span class="lines">@@ -2129,7 +2129,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return string The name of the calling function
</span><span class="cx"> */
</span><del>- function get_caller() {
</del><ins>+ public function get_caller() {
</ins><span class="cx"> return wp_debug_backtrace_summary( __CLASS__ );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2140,7 +2140,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return false|string false on failure, version number on success
</span><span class="cx"> */
</span><del>- function db_version() {
</del><ins>+ public function db_version() {
</ins><span class="cx"> if ( $this->use_mysqli ) {
</span><span class="cx"> $server_info = mysqli_get_server_info( $this->dbh );
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>