Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary inline @see tags from a variety of parameter and return descriptions in wp-includes/wp-db.php.

Browse Source 
See #31888.

Built from https://develop.svn.wordpress.org/trunk@32050


git-svn-id: http://core.svn.wordpress.org/trunk@32029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-04-05 17:17:27 +00:00
parent 777ad7647c
commit 8f0e359618
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta4-32049';
$wp_version = '4.2-beta4-32050';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

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

@ -2179,7 +2179,7 @@ class wpdb {
* @access protected
*
* @param string $table Table name.
* @return string|WP_Error Table character set, {@see WP_Error} object if it couldn't be found.
* @return string|WP_Error Table character set, WP_Error object if it couldn't be found.
*/
protected function get_table_charset( $table ) {
$tablekey = strtolower( $table );
@ -2279,7 +2279,7 @@ class wpdb {
* @param string $table Table name.
* @param string $column Column name.
* @return mixed Column character set as a string. False if the column has no
* character set. {@see WP_Error} object if there was an error.
* character set. WP_Error object if there was an error.
*/
public function get_col_charset( $table, $column ) {
$tablekey = strtolower( $table );
@ -2370,7 +2370,7 @@ class wpdb {
* @return array|WP_Error The $data parameter, with invalid characters removed from
* each value. This works as a passthrough: any additional keys
* such as 'field' are retained in each value array. If we cannot
* remove invalid characters, a {@see WP_Error} object is returned.
* remove invalid characters, a WP_Error object is returned.
*/
protected function strip_invalid_text( $data ) {
// Some multibyte character sets that we can check in PHP.
@ -2503,7 +2503,7 @@ class wpdb {
* @access protected
*
* @param string $query Query to convert.
* @return string|WP_Error The converted query, or a {@see WP_Error} object if the conversion fails.
* @return string|WP_Error The converted query, or a WP_Error object if the conversion fails.
*/
protected function strip_invalid_text_from_query( $query ) {
$table = $this->get_table_from_query( $query );
@ -2544,7 +2544,7 @@ class wpdb {
* @param string $table Table name.
* @param string $column Column name.
* @param string $value The text to check.
* @return string|WP_Error The converted string, or a `WP_Error` object if the conversion fails.
* @return string|WP_Error The converted string, or a WP_Error object if the conversion fails.
*/
public function strip_invalid_text_for_column( $table, $column, $value ) {
if ( ! is_string( $value ) || $this->check_ascii( $value ) ) {