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

Fix inline documentation syntax for two formatting functions added in 4.3. 

* `wptexturize_primes()` See [32863]
* `format_for_editor()` See [32899]

See #32891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-07-13 21:30:24 +00:00
parent 21632885c7
commit 9e12c71872
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/formatting.php
View File

@ -322,10 +322,11 @@ function wptexturize( $text, $reset = false ) {
* *
* @since 4.3.0 * @since 4.3.0
* *
* @param string $haystack The plain text to be searched. * @param string $haystack The plain text to be searched.
* @param string $needle The character to search for such as ' or ". * @param string $needle The character to search for such as ' or ".
* @param string $prime The prime char to use for replacement. * @param string $prime The prime char to use for replacement.
* @param string $open_quote The opening quote char. Opening quote replacement must be accomplished already. * @param string $open_quote The opening quote char. Opening quote replacement must be
* accomplished already.
* @param string $close_quote The closing quote char to use for replacement. * @param string $close_quote The closing quote char to use for replacement.
* @return string The $haystack value after primes and quotes replacements. * @return string The $haystack value after primes and quotes replacements.
*/ */
@ -3078,8 +3079,8 @@ function ent2ncr( $text ) {
* Generally the browsers treat everything inside a textarea as text, but * Generally the browsers treat everything inside a textarea as text, but
* it is still a good idea to HTML entity encode `<`, `>` and `&` in the content. * it is still a good idea to HTML entity encode `<`, `>` and `&` in the content.
* *
* The filter 'format_for_editor' is applied here. If $text is empty the filter will * The filter {@see 'format_for_editor'} is applied here. If `$text` is empty the
* be applied to an empty string. * filter will be applied to an empty string.
* *
* @since 4.3.0 * @since 4.3.0
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta2-33224'; $wp_version = '4.3-beta2-33225';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.