WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

@since additions and updates. Props demetris. fixes #15867 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-12-20 12:49:18 +00:00
parent 8d56bc7265
commit a96f9d899f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/wp-db.php
View File

@ -64,7 +64,7 @@ class wpdb {
* Whether to suppress errors during the DB bootstrapping. * Whether to suppress errors during the DB bootstrapping.
* *
* @access private * @access private
* @since 2.5 * @since 2.5.0
* @var bool * @var bool
*/ */
var $suppress_errors = false; var $suppress_errors = false;
@ -73,7 +73,7 @@ class wpdb {
* The last error during query. * The last error during query.
* *
* @see get_last_error() * @see get_last_error()
* @since 2.5 * @since 2.5.0
* @access private * @access private
* @var string * @var string
*/ */
@ -91,7 +91,7 @@ class wpdb {
/** /**
* Count of rows returned by previous query * Count of rows returned by previous query
* *
* @since 1.2 * @since 1.2.0
* @access private * @access private
* @var int * @var int
*/ */
@ -522,6 +522,8 @@ class wpdb {
/** /**
* Set $this->charset and $this->collate * Set $this->charset and $this->collate
*
* @since 3.1.0
*/ */
function init_charset() { function init_charset() {
if ( function_exists('is_multisite') && is_multisite() ) { if ( function_exists('is_multisite') && is_multisite() ) {
@ -541,6 +543,8 @@ class wpdb {
/** /**
* Sets the connection's character set. * Sets the connection's character set.
* *
* @since 3.1.0
*
* @param resource $dbh The resource given by mysql_connect * @param resource $dbh The resource given by mysql_connect
* @param string $charset The character set (optional) * @param string $charset The character set (optional)
* @param string $collate The collation (optional) * @param string $collate The collation (optional)
@ -776,7 +780,7 @@ class wpdb {
* *
* @see mysql_real_escape_string() * @see mysql_real_escape_string()
* @see addslashes() * @see addslashes()
* @since 2.8 * @since 2.8.0
* @access private * @access private
* *
* @param string $string to escape * @param string $string to escape
@ -794,7 +798,7 @@ class wpdb {
* *
* @uses wpdb::_escape() * @uses wpdb::_escape()
* @uses wpdb::_real_escape() * @uses wpdb::_real_escape()
* @since 2.8 * @since 2.8.0
* @access private * @access private
* *
* @param string|array $data * @param string|array $data
@ -997,7 +1001,7 @@ class wpdb {
* By default database errors are suppressed, with a simple * By default database errors are suppressed, with a simple
* call to this function they can be enabled. * call to this function they can be enabled.
* *
* @since 2.5 * @since 2.5.0
* @see wpdb::hide_errors() * @see wpdb::hide_errors()
* @param bool $suppress Optional. New value. Defaults to true. * @param bool $suppress Optional. New value. Defaults to true.
* @return bool Old value * @return bool Old value
@ -1022,6 +1026,8 @@ class wpdb {
/** /**
* Connect to and select database * Connect to and select database
*
* @since 3.0.0
*/ */
function db_connect() { function db_connect() {
global $db_list, $global_db_list; global $db_list, $global_db_list;
@ -1511,7 +1517,7 @@ class wpdb {
/** /**
* Determine if a database supports a particular feature * Determine if a database supports a particular feature
* *
* @since 2.7 * @since 2.7.0
* @see wpdb::db_version() * @see wpdb::db_version()
* *
* @param string $db_cap the feature * @param string $db_cap the feature
@ -1558,6 +1564,8 @@ class wpdb {
/** /**
* The database version number. * The database version number.
* *
* @since 2.7.0
*
* @return false|string false on failure, version number on success * @return false|string false on failure, version number on success
*/ */
function db_version() { function db_version() {