Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-22 21:04:57 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Spell "line breaks" in a consistent way.

Browse Source 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48175


git-svn-id: http://core.svn.wordpress.org/trunk@47944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-06-26 09:30:11 +00:00
parent a659c36414
commit a55c84380a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/deprecated.php
View File

@ -2947,13 +2947,13 @@ function get_current_theme() {
* Accepts matches array from preg_replace_callback in wpautop() or a string.
*
* Ensures that the contents of a `<pre>...</pre>` HTML block are not
* converted into paragraphs or line-breaks.
* converted into paragraphs or line breaks.
*
* @since 1.2.0
* @deprecated 3.4.0
*
* @param array|string $matches The array or string
* @return string The pre block without paragraph/line-break conversion.
* @return string The pre block without paragraph/line break conversion.
*/
function clean_pre($matches) {
_deprecated_function( __FUNCTION__, '3.4.0' );

14
wp-includes/formatting.php
View File

@ -425,16 +425,16 @@ function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
}
/**
* Replaces double line-breaks with paragraph elements.
* Replaces double line breaks with paragraph elements.
*
* A group of regex replaces used to identify text formatted with newlines and
* replace double line-breaks with HTML paragraph tags. The remaining line-breaks
* replace double line breaks with HTML paragraph tags. The remaining line breaks
* after conversion become <<br />> tags, unless $br is set to '0' or 'false'.
*
* @since 0.71
*
* @param string $pee The text which has to be formatted.
* @param bool $br Optional. If set, this will convert all remaining line-breaks
* @param bool $br Optional. If set, this will convert all remaining line breaks
* after paragraphing. Line breaks within `<script>`, `<style>`,
* and `<svg>` tags are not affected. Default true.
* @return string Text which has been converted into correct paragraph tags.
@ -927,8 +927,8 @@ function seems_utf8( $str ) {
* converting single quotes if set to 'single',
* double if set to 'double' or both if otherwise set.
* Default is ENT_NOQUOTES.
* @param false|string $charset Optional. The character encoding of the string. Default is false.
* @param bool $double_encode Optional. Whether to encode existing html entities. Default is false.
* @param false|string $charset Optional. The character encoding of the string. Default false.
* @param bool $double_encode Optional. Whether to encode existing html entities. Default false.
* @return string The encoded text with HTML entities.
*/
function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
@ -1091,7 +1091,7 @@ function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
* @since 2.8.0
*
* @param string $string The text which is to be checked.
* @param bool $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
* @param bool $strip Optional. Whether to attempt to strip out invalid UTF8. Default false.
* @return string The checked text.
*/
function wp_check_invalid_utf8( $string, $strip = false ) {
@ -3789,7 +3789,7 @@ function human_time_diff( $from, $to = 0 ) {
* @since 5.2.0 Added the `$post` parameter.
*
* @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
* @param WP_Post|object|int $post Optional. WP_Post instance or Post ID/object. Default is null.
* @param WP_Post|object|int $post Optional. WP_Post instance or Post ID/object. Default null.
* @return string The excerpt.
*/
function wp_trim_excerpt( $text = '', $post = null ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.5-alpha-48174';
$wp_version = '5.5-alpha-48175';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.