IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docs: Fix formatting, tense, verb conjugation, and other syntax for wp-includes/* elements introduced or changed in 4.6.

Browse Source 
Part 2/2.

Fixes #37318.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes
2016-07-20 19:33:30 +00:00
parent 68756af049
commit e6267dcf19
12 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -756,15 +756,15 @@ class wpdb {
}
/**
* Given a charset and collation, determine the best charset and collation to use.
* Determines the best charset and collation to use given a charset and collation.
*
* For example, when able, utf8mb4 should be used instead of utf8.
*
* @since 4.6.0
* @access public
*
* @param string $charset The character set to check.
* @param string $collate The collation to check.
*
* @param string $charset The character set to check.
* @param string $collate The collation to check.
* @return array The most appropriate character set and collation to use.
*/
public function determine_charset( $charset, $collate ) {
@@ -3236,8 +3236,8 @@ class wpdb {
* Determine if a database supports a particular feature.
*
* @since 2.7.0
* @since 4.1.0 Support was added for the 'utf8mb4' feature.
* @since 4.6.0 Support was added for the 'utf8mb4_520' feature.
* @since 4.1.0 Added support for the 'utf8mb4' feature.
* @since 4.6.0 Added support for the 'utf8mb4_520' feature.
*
* @see wpdb::db_version()
*
@@ -3276,7 +3276,7 @@ class wpdb {
} else {
return version_compare( $client_version, '5.5.3', '>=' );
}
case 'utf8mb4_520' : // @since 4.6.0
case 'utf8mb4_520' : // @since 4.6.0
return version_compare( $version, '5.6', '>=' );
}