%s [%s]%s
%s [%s]%s
%1$s %2$s
', where %1$s is the * submit button markup and %2$s is the comment hidden fields. - * @type string $format The comment form format. Default 'xhtml'. Accepts 'xhtml', 'html5'. * } * @param int|WP_Post $post Optional. Post ID or WP_Post object to generate the form for. Default current post. */ @@ -2519,16 +2516,12 @@ function comment_form( $args = array(), $post = null ) { $user_identity = $user->exists() ? $user->display_name : ''; $args = wp_parse_args( $args ); - if ( ! isset( $args['format'] ) ) { - $args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml'; - } $req = get_option( 'require_name_email' ); - $html5 = 'html5' === $args['format']; - // Define attributes in HTML5 or XHTML syntax. - $required_attribute = ( $html5 ? ' required' : ' required="required"' ); - $checked_attribute = ( $html5 ? ' checked' : ' checked="checked"' ); + // Define attributes. + $required_attribute = ' required'; + $checked_attribute = ' checked'; // Identify required fields visually and create a message about the indicator. $required_indicator = ' ' . wp_required_field_indicator(); @@ -2543,7 +2536,7 @@ function comment_form( $args = array(), $post = null ) { ( $req ? $required_indicator : '' ) ), sprintf( - '', + '', esc_attr( $commenter['comment_author'] ), ( $req ? $required_attribute : '' ) ) @@ -2556,8 +2549,7 @@ function comment_form( $args = array(), $post = null ) { ( $req ? $required_indicator : '' ) ), sprintf( - '', - ( $html5 ? 'type="email"' : 'type="text"' ), + '', esc_attr( $commenter['comment_author_email'] ), ( $req ? $required_attribute : '' ) ) @@ -2569,8 +2561,7 @@ function comment_form( $args = array(), $post = null ) { __( 'Website' ) ), sprintf( - '', - ( $html5 ? 'type="url"' : 'type="text"' ), + '', esc_attr( $commenter['comment_author_url'] ) ) ), @@ -2582,7 +2573,7 @@ function comment_form( $args = array(), $post = null ) { $fields['cookies'] = sprintf( '', sprintf( - '', + '', $consent ), sprintf( @@ -2663,9 +2654,8 @@ function comment_form( $args = array(), $post = null ) { 'cancel_reply_after' => '', 'cancel_reply_link' => __( 'Cancel reply' ), 'label_submit' => __( 'Post Comment' ), - 'submit_button' => '', + 'submit_button' => '', 'submit_field' => '%1$s %2$s
', - 'format' => 'xhtml', ); /** diff --git a/src/wp-includes/customize/class-wp-customize-color-control.php b/src/wp-includes/customize/class-wp-customize-color-control.php index 14d5abcdb7..54173f5e98 100644 --- a/src/wp-includes/customize/class-wp-customize-color-control.php +++ b/src/wp-includes/customize/class-wp-customize-color-control.php @@ -111,9 +111,9 @@ public function content_template() {
<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
- 
+
<# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
- 
+
<# } else if ( 'audio' === data.attachment.type ) { #>
<# if ( data.attachment.image && data.attachment.image.src && data.attachment.image.src !== data.attachment.icon ) { #>
- 
+
<# } else { #>
- 
+
<# } #>
<# if ( data.attachment.album || data.attachment.meta.album ) { #>
@@ -170,17 +170,17 @@ public function content_template() {
<# } #>
<# } else if ( 'video' === data.attachment.type ) { #>
+
<# } #>
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php
index 33d4067bfe..2c03af107a 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php
@@ -41,7 +41,7 @@ protected function content_template() {
<# var elementId = _.uniqueId( 'customize-nav-menu-auto-add-control-' ); #>
-
+
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
index ef0b779f42..e62e5e5271 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
@@ -91,44 +91,44 @@ public function content_template() {
<# if ( 'custom' === data.item_type ) { #>
+
<# } else { #>
-
-
<# } else { #>
- <# } #>
@@ -158,8 +158,8 @@ public function content_template() {
{{ data.description }}
diff --git a/src/wp-includes/customize/class-wp-customize-site-icon-control.php b/src/wp-includes/customize/class-wp-customize-site-icon-control.php index bf3bb79d4d..f877b9b2e3 100644 --- a/src/wp-includes/customize/class-wp-customize-site-icon-control.php +++ b/src/wp-includes/customize/class-wp-customize-site-icon-control.php @@ -63,14 +63,14 @@ public function content_template() { <# if ( data.attachment.sizes ) { #>
-  ? 'browser-rtl.png' : 'browser.png' ) ) ); ?>)
+
-
+
- 
+
diff --git a/src/wp-includes/customize/class-wp-customize-theme-control.php b/src/wp-includes/customize/class-wp-customize-theme-control.php
index 8998408e5c..791664984e 100644
--- a/src/wp-includes/customize/class-wp-customize-theme-control.php
+++ b/src/wp-includes/customize/class-wp-customize-theme-control.php
@@ -74,7 +74,7 @@ public function content_template() {
<# if ( data.theme.screenshot && data.theme.screenshot[0] ) { #>
'. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -397,7 +397,7 @@ function user_can_edit_user($user_id, $other_user) { * Default -1. * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0. */ -function get_linksbyname($cat_name = "noname", $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', +function get_linksbyname($cat_name = "noname", $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', $show_description = true, $show_rating = false, $limit = -1, $show_updated = 0) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -425,7 +425,7 @@ function wp_get_linksbyname($category, $args = '') { _deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()'); $defaults = array( - 'after' => '
', + 'after' => '
', 'before' => '', 'categorize' => 0, 'category_after' => '', @@ -481,7 +481,7 @@ function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit * $links = get_linkobjects(1); * if ($links) { * foreach ($links as $link) { - * echo ''.$link->link_name.'
'.$link->link_description.' ';
+ * echo ''.$link->link_name.'
'.$link->link_description.' ';
* }
* }
*
@@ -537,7 +537,7 @@ function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
* @param string $cat_name Optional. The category name to use. If no match is found, uses all.
* Default 'noname'.
* @param string $before Optional. The HTML to output before the link. Default empty.
- * @param string $after Optional. The HTML to output after the link. Default '
'. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -551,7 +551,7 @@ function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) { * Default -1. * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0. */ -function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '
', $between = " ", +function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -568,7 +568,7 @@ function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = * @param int $category Optional. The category to use. If no category supplied, uses all. * Default 0. * @param string $before Optional. The HTML to output before the link. Default empty. - * @param string $after Optional. The HTML to output after the link. Default '
'. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -582,7 +582,7 @@ function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = * Default -1. * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0. */ -function get_links_withrating($category = -1, $before = '', $after = '
', $between = " ", $show_images = true, +function get_links_withrating($category = -1, $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -826,7 +826,7 @@ function get_author_link($display, $author_id, $author_nicename = '') { * @param string $more_file * @return string */ -function link_pages($before='
', $after='
', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', +function link_pages($before='
', $after='
', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') { _deprecated_function( __FUNCTION__, '2.1.0', 'wp_link_pages()' ); @@ -895,7 +895,7 @@ function wp_get_links($args = '') { } $defaults = array( - 'after' => '
', + 'after' => '
', 'before' => '', 'between' => ' ', 'categorize' => 0, @@ -925,7 +925,7 @@ function wp_get_links($args = '') { * @param int $category Optional. The category to use. If no category supplied uses all. * Default 0. * @param string $before Optional. The HTML to output before the link. Default empty. - * @param string $after Optional. The HTML to output after the link. Default '
'. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -942,7 +942,7 @@ function wp_get_links($args = '') { * @param bool $display Whether to display the results, or return them instead. * @return null|string */ -function get_links($category = -1, $before = '', $after = '
', $between = ' ', $show_images = true, $orderby = 'name', +function get_links($category = -1, $before = '', $after = '
', $between = ' ', $show_images = true, $orderby = 'name', $show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $display = true) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -996,9 +996,9 @@ function get_links($category = -1, $before = '', $after = '
', $between = ' if ( $row->link_image != null && $show_images ) { if ( strpos($row->link_image, 'http') !== false ) - $output .= "![](\"$row-)
link_image\" $alt $title />";
+ $output .= "link_image\" $alt $title>";
else // If it's a relative path.
- $output .= "![](\"")
link_image\" $alt $title />";
+ $output .= "link_image\" $alt $title>";
} else {
$output .= $name;
}
@@ -1973,7 +1973,7 @@ function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
$post_title = esc_attr($post->post_title);
- $icon = "
";
+ $icon = "";
return apply_filters( 'attachment_icon', $icon, $post->ID );
}
@@ -2698,7 +2698,7 @@ function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $ex
$link = $start ? "\n";
+ $link .= "' href='" . get_permalink($post) . "'>\n";
$boundary = $start ? 'start' : 'end';
return apply_filters( "{$boundary}_post_rel_link", $link );
@@ -2731,7 +2731,7 @@ function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_
function get_index_rel_link() {
_deprecated_function( __FUNCTION__, '3.3.0' );
- $link = "\n";
+ $link = "\n";
return apply_filters( "index_rel_link", $link );
}
@@ -2773,7 +2773,7 @@ function get_parent_post_rel_link( $title = '%title' ) {
$link = "\n";
+ $link .= "' href='" . get_permalink($post) . "'>\n";
return apply_filters( "parent_post_rel_link", $link );
}
@@ -4167,11 +4167,11 @@ function wp_no_robots() {
_deprecated_function( __FUNCTION__, '5.7.0', 'wp_robots_no_robots()' );
if ( get_option( 'blog_public' ) ) {
- echo "\n";
+ echo "\n";
return;
}
- echo "\n";
+ echo "\n";
}
/**
@@ -4195,7 +4195,7 @@ function wp_sensitive_page_meta() {
_deprecated_function( __FUNCTION__, '5.7.0', 'wp_robots_sensitive_page()' );
?>
-
+
' . "\n";
+ $output .= '' . "\n";
if ( class_exists( 'SimpleXMLElement' ) ) {
- $output .= '' . "\n";
+ $output .= '' . "\n";
}
}
@@ -1062,10 +1062,9 @@ function enqueue_embed_scripts() {
* @since 4.4.0
*/
function print_embed_styles() {
- $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
$suffix = SCRIPT_DEBUG ? '' : '.min';
?>
- >
+
- ![]()
+ ![]()
<# } else { #>
diff --git a/src/wp-includes/customize/class-wp-customize-themes-section.php b/src/wp-includes/customize/class-wp-customize-themes-section.php
index 968e464e8a..0d3b3fc5de 100644
--- a/src/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/src/wp-includes/customize/class-wp-customize-themes-section.php
@@ -155,7 +155,7 @@ protected function filter_bar_content_template() {
_e( 'Search themes…' );
?>
-
+
$feature_name ) : ?>
-
+
diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php
index 791c88aa5c..ea7ea73e86 100644
--- a/src/wp-includes/default-filters.php
+++ b/src/wp-includes/default-filters.php
@@ -276,6 +276,7 @@
add_filter( 'option_home', '_config_wp_home' );
add_filter( 'option_siteurl', '_config_wp_siteurl' );
add_filter( 'tiny_mce_before_init', '_mce_set_direction' );
+add_filter( 'tiny_mce_before_init', '_mce_set_element_format' );
add_filter( 'teeny_mce_before_init', '_mce_set_direction' );
add_filter( 'pre_kses', 'wp_pre_kses_less_than' );
add_filter( 'sanitize_title', 'sanitize_title_with_dashes', 10, 3 );
diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php
index 00acc4f396..14c264859a 100644
--- a/src/wp-includes/deprecated.php
+++ b/src/wp-includes/deprecated.php
@@ -382,7 +382,7 @@ function user_can_edit_user($user_id, $other_user) {
* @param string $cat_name Optional. The category name to use. If no match is found, uses all.
* Default 'noname'.
* @param string $before Optional. The HTML to output before the link. Default empty.
- * @param string $after Optional. The HTML to output after the link. Default ''. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -397,7 +397,7 @@ function user_can_edit_user($user_id, $other_user) { * Default -1. * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0. */ -function get_linksbyname($cat_name = "noname", $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', +function get_linksbyname($cat_name = "noname", $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', $show_description = true, $show_rating = false, $limit = -1, $show_updated = 0) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -425,7 +425,7 @@ function wp_get_linksbyname($category, $args = '') { _deprecated_function(__FUNCTION__, '2.1.0', 'wp_list_bookmarks()'); $defaults = array( - 'after' => '
', + 'after' => '
', 'before' => '', 'categorize' => 0, 'category_after' => '', @@ -481,7 +481,7 @@ function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit * $links = get_linkobjects(1); * if ($links) { * foreach ($links as $link) { - * echo '
'.$link->link_description.'
'.$link->link_description.'
'. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -551,7 +551,7 @@ function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) { * Default -1. * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0. */ -function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '
', $between = " ", +function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -568,7 +568,7 @@ function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = * @param int $category Optional. The category to use. If no category supplied, uses all. * Default 0. * @param string $before Optional. The HTML to output before the link. Default empty. - * @param string $after Optional. The HTML to output after the link. Default '
'. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -582,7 +582,7 @@ function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = * Default -1. * @param int $show_updated Optional. Whether to show last updated timestamp. Default 0. */ -function get_links_withrating($category = -1, $before = '', $after = '
', $between = " ", $show_images = true, +function get_links_withrating($category = -1, $before = '', $after = '
', $between = " ", $show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -826,7 +826,7 @@ function get_author_link($display, $author_id, $author_nicename = '') { * @param string $more_file * @return string */ -function link_pages($before='
', $after='
', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', +function link_pages($before='
', $after='
', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') { _deprecated_function( __FUNCTION__, '2.1.0', 'wp_link_pages()' ); @@ -895,7 +895,7 @@ function wp_get_links($args = '') { } $defaults = array( - 'after' => '
', + 'after' => '
', 'before' => '', 'between' => ' ', 'categorize' => 0, @@ -925,7 +925,7 @@ function wp_get_links($args = '') { * @param int $category Optional. The category to use. If no category supplied uses all. * Default 0. * @param string $before Optional. The HTML to output before the link. Default empty. - * @param string $after Optional. The HTML to output after the link. Default '
'. + * @param string $after Optional. The HTML to output after the link. Default '
'. * @param string $between Optional. The HTML to output between the link/image and its description. * Not used if no image or $show_images is true. Default ' '. * @param bool $show_images Optional. Whether to show images (if defined). Default true. @@ -942,7 +942,7 @@ function wp_get_links($args = '') { * @param bool $display Whether to display the results, or return them instead. * @return null|string */ -function get_links($category = -1, $before = '', $after = '
', $between = ' ', $show_images = true, $orderby = 'name', +function get_links($category = -1, $before = '', $after = '
', $between = ' ', $show_images = true, $orderby = 'name', $show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $display = true) { _deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' ); @@ -996,9 +996,9 @@ function get_links($category = -1, $before = '', $after = '
', $between = ' if ( $row->link_image != null && $show_images ) { if ( strpos($row->link_image, 'http') !== false ) - $output .= "
-
+
@@ -1200,7 +1199,7 @@ function print_embed_sharing_dialog() {
*/
function the_embed_site_title() {
$site_title = sprintf(
- '%s',
+ '
%s',
esc_url( home_url() ),
esc_url( get_site_icon_url( 32, includes_url( 'images/cp-logo-aqua.png' ) ) ),
esc_url( get_site_icon_url( 64, includes_url( 'images/cp-logo-aqua.png' ) ) ),
diff --git a/src/wp-includes/feed.php b/src/wp-includes/feed.php
index a015a0685f..6c5e46b8d2 100644
--- a/src/wp-includes/feed.php
+++ b/src/wp-includes/feed.php
@@ -440,20 +440,14 @@ function the_category_rss( $type = null ) {
}
/**
- * Displays the HTML type based on the blog setting.
+ * Displays the HTML type.
*
- * The two possible values are either 'xhtml' or 'html'.
*
* @since 2.2.0
+ * @since CP-2.0.0 Site content type will always be 'html'.
*/
function html_type_rss() {
- $type = get_bloginfo( 'html_type' );
- if ( strpos( $type, 'xhtml' ) !== false ) {
- $type = 'xhtml';
- } else {
- $type = 'html';
- }
- echo $type;
+ echo 'html';
}
/**
diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index 91c2ce4734..5db54014d6 100644
--- a/src/wp-includes/formatting.php
+++ b/src/wp-includes/formatting.php
@@ -429,7 +429,7 @@ function _wptexturize_pushpop_element( $text, &$stack, $disabled_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
- * after conversion become `
` tags, unless `$br` is set to '0' or 'false'.
+ * after conversion become `
` tags, unless `$br` is set to '0' or 'false'.
*
* @since 0.71
*
@@ -571,20 +571,20 @@ function wpautop( $text, $br = true ) {
$text = preg_replace_callback( '/<(script|style|svg|math).*?<\/\\1>/s', '_autop_newline_preservation_helper', $text );
// Normalize
- $text = str_replace( array( '
', '
' ), '
', $text );
+ $text = str_replace( array( '
', '
' ), '
', $text );
- // Replace any new line characters that aren't preceded by a
with a
.
- $text = preg_replace( '|(?)\s*\n|', "
\n", $text );
+ // Replace any new line characters that aren't preceded by a
with a
.
+ $text = preg_replace( '|(?)\s*\n|', "
\n", $text );
// Replace newline placeholders with newlines.
$text = str_replace( '
tag is after an opening or closing block tag, remove it.
- $text = preg_replace( '!(]*>)\s*
!', '$1', $text );
+ // If a
tag is after an opening or closing block tag, remove it.
+ $text = preg_replace( '!(]*>)\s*
!', '$1', $text );
- // If a
tag is before a subset of opening or closing block tags, remove it.
- $text = preg_replace( '!
(\s*]*>)!', '$1', $text );
+ // If a
tag is before a subset of opening or closing block tags, remove it.
+ $text = preg_replace( '!
(\s*]*>)!', '$1', $text );
$text = preg_replace( "|\n
tags with their original content.
@@ -2677,7 +2677,7 @@ function force_balance_tags( $text ) {
// Attributes.
if ( $has_self_closer && $is_single_tag ) {
- // We need some space - avoid
and prefer
.
+ // We need some space - avoid
and prefer
.
$pre_attribute_ws = ' ';
}
@@ -3441,7 +3441,7 @@ function translate_smiley( $matches ) {
*/
$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
- return sprintf( '
', esc_url( $src_url ), esc_attr( $smiley ) );
+ return sprintf( '', esc_url( $src_url ), esc_attr( $smiley ) );
}
/**
@@ -5758,10 +5758,8 @@ function print_emoji_styles() {
}
$printed = true;
-
- $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
?>
->
+\n";
}
@@ -1999,15 +1995,14 @@ function script_concat_settings() {
* @return string String made of sanitized `
';
- if ( 'html5' === $format ) {
- // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
- $title = trim( strip_tags( $title ) );
- $aria_label = $title ? $title : $default_title;
- echo '';
}
echo $args['after_widget'];
@@ -218,13 +205,13 @@ public function form( $instance ) {
?>
-
+
- id="get_field_id( 'dropdown' ); ?>" name="get_field_name( 'dropdown' ); ?>" />
+ id="get_field_id( 'dropdown' ); ?>" name="get_field_name( 'dropdown' ); ?>">
-
- id="get_field_id( 'count' ); ?>" name="get_field_name( 'count' ); ?>" />
+
+ id="get_field_id( 'count' ); ?>" name="get_field_name( 'count' ); ?>">
-
+
';
-
- $type_attr = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
?>
->
-/*
(function() {
var dropdown = document.getElementById( "" );
function onCatChange() {
@@ -106,22 +103,14 @@ function onCatChange() {
}
dropdown.onchange = onCatChange;
})();
-/* ]]> */
';
- }
+ // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
+ $title = trim( strip_tags( $title ) );
+ $aria_label = $title ? $title : $default_title;
+ echo '';
}
echo $args['after_widget'];
@@ -186,19 +173,19 @@ public function form( $instance ) {
?>
-
+
- />
+ >
-
+
- />
+ >
-
+
- />
+ >
default_instance );
?>
-
+
- id="get_field_id( 'images' ); ?>" name="get_field_name( 'images' ); ?>" />
+ id="get_field_id( 'images' ); ?>" name="get_field_name( 'images' ); ?>">
-
+
- id="get_field_id( 'name' ); ?>" name="get_field_name( 'name' ); ?>" />
+ id="get_field_id( 'name' ); ?>" name="get_field_name( 'name' ); ?>">
-
+
- id="get_field_id( 'description' ); ?>" name="get_field_name( 'description' ); ?>" />
+ id="get_field_id( 'description' ); ?>" name="get_field_name( 'description' ); ?>">
-
+
- id="get_field_id( 'rating' ); ?>" name="get_field_name( 'rating' ); ?>" />
+ id="get_field_id( 'rating' ); ?>" name="get_field_name( 'rating' ); ?>">
-
+
"
<# } #>
- />
+ >
<# if ( index === 5 && data.ids.length > 6 ) { #>
',
+ '
',
esc_attr( $classes ),
esc_url( $instance['url'] ),
esc_attr( $instance['alt'] ),
@@ -368,7 +368,7 @@ public function render_control_template_scripts() {
?>
"
<# } #>
- />
+ >
<# } #>
<# } else if ( data.is_oembed && data.model.poster ) { #>
- 
+
<# } else if ( data.is_oembed ) { #>
diff --git a/src/wp-includes/widgets/class-wp-widget-media.php b/src/wp-includes/widgets/class-wp-widget-media.php
index da4950daea..305b35ce04 100644
--- a/src/wp-includes/widgets/class-wp-widget-media.php
+++ b/src/wp-includes/widgets/class-wp-widget-media.php
@@ -346,7 +346,7 @@ class="media-widget-instance-property"
name="get_field_name( $name ) ); ?>"
id="get_field_id( $name ) ); // Needed specifically by wpWidgets.appendTitle(). ?>"
value=""
- />
+ >
';
- }
+ // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
+ $title = trim( strip_tags( $title ) );
+ $aria_label = $title ? $title : $default_title;
+ echo '';
echo $args['after_widget'];
}
@@ -137,7 +128,7 @@ public function form( $instance ) {
?>
-
+
';
- }
+ // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
+ $title = trim( strip_tags( $title ) );
+ $aria_label = $title ? $title : $default_title;
+ echo '';
echo $args['after_widget'];
}
@@ -162,7 +153,7 @@ public function form( $instance ) {
?>
-
+
@@ -176,8 +167,8 @@ public function form( $instance ) {
-
-
+
+
.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}',
- $type_attr
- );
+ print '';
}
/**
@@ -125,17 +120,10 @@ public function widget( $args, $instance ) {
$recent_comments_id = ( $first_instance ) ? 'recentcomments' : "recentcomments-{$this->number}";
$first_instance = false;
- $format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml';
-
- /** This filter is documented in wp-includes/widgets/class-wp-nav-menu-widget.php */
- $format = apply_filters( 'navigation_widgets_format', $format );
-
- if ( 'html5' === $format ) {
- // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
- $title = trim( strip_tags( $title ) );
- $aria_label = $title ? $title : $default_title;
- $output .= '';
$output .= $args['after_widget'];
echo $output;
@@ -195,12 +179,12 @@ public function form( $instance ) {
?>
-
+
-
+
';
- }
+ // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
+ $title = trim( strip_tags( $title ) );
+ $aria_label = $title ? $title : $default_title;
+ echo '';
echo $args['after_widget'];
}
@@ -167,16 +157,16 @@ public function form( $instance ) {
?>
-
+
-
+
- id="get_field_id( 'show_date' ); ?>" name="get_field_name( 'show_date' ); ?>" />
+ id="get_field_id( 'show_date' ); ?>" name="get_field_name( 'show_date' ); ?>">
',
+ ' ',
esc_url( $feed_url ),
esc_url( $feed_icon ),
esc_attr__( 'RSS' ),
@@ -118,23 +119,14 @@ public function widget( $args, $instance ) {
echo $args['before_title'] . $title . $args['after_title'];
}
- $format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml';
-
- /** This filter is documented in wp-includes/widgets/class-wp-nav-menu-widget.php */
- $format = apply_filters( 'navigation_widgets_format', $format );
-
- if ( 'html5' === $format ) {
- // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
- $title = trim( strip_tags( $title ) );
- $aria_label = $title ? $title : __( 'RSS Feed' );
- echo '';
echo $args['after_widget'];
diff --git a/src/wp-includes/widgets/class-wp-widget-search.php b/src/wp-includes/widgets/class-wp-widget-search.php
index b67ac239a6..76e5fb2205 100644
--- a/src/wp-includes/widgets/class-wp-widget-search.php
+++ b/src/wp-includes/widgets/class-wp-widget-search.php
@@ -70,7 +70,7 @@ public function form( $instance ) {
?>
-
+
';
- }
+ // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
+ $title = trim( strip_tags( $title ) );
+ $aria_label = $title ? $title : $default_title;
+ echo '';
- }
+ echo '';
echo $args['after_widget'];
}
@@ -149,7 +140,7 @@ public function form( $instance ) {
?>
-
+
true ), 'object' );
@@ -160,7 +151,7 @@ public function form( $instance ) {
// No tag cloud supporting taxonomies found, display error message.
case 0:
?>
-
+
@@ -172,7 +163,7 @@ public function form( $instance ) {
$keys = array_keys( $taxonomies );
$taxonomy = reset( $keys );
?>
-
+
0 ) {
?>
- />
+ >
get_field_id( 'visual' ); ?>" name="get_field_name( 'visual' ); ?>" class="visual" type="hidden" value="">
-
+
@@ -504,7 +504,7 @@ public function form( $instance ) {
- />
+ >
>
-
+
<?php echo $login_title; ?>
-
+
-
get_error_data( $code );
foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
if ( 'message' === $severity ) {
- $messages .= ' ' . $error_message . "
\n";
+ $messages .= ' ' . $error_message . "
\n";
} else {
- $errors .= ' ' . $error_message . "
\n";
+ $errors .= ' ' . $error_message . "
\n";
}
}
}
@@ -326,15 +326,15 @@ function login_footer( $input_id = '' ) {
?>
-
+
-
+
-
+
@@ -347,7 +347,7 @@ function login_footer( $input_id = '' ) {
if ( ! empty( $input_id ) ) {
?>
-
@@ -375,7 +375,7 @@ function login_footer( $input_id = '' ) {
*/
function wp_shake_js() {
?>
-
-
+
-
+
@@ -655,7 +655,7 @@ function wp_login_viewport_meta() {
?>
-
+
0 ) : ?>
@@ -805,7 +805,7 @@ function wp_login_viewport_meta() {
@@ -921,7 +921,7 @@ function wp_login_viewport_meta() {
?>
@@ -1045,14 +1045,14 @@ function wp_login_viewport_meta() {
login_header( __( 'Registration Form' ), '', $errors );
?>
-
@@ -1254,7 +1254,7 @@ function wp_login_viewport_meta() {
if ( $customize_login ) {
?>
-
+
" method="post">
- class="input" value="" size="20" autocapitalize="off" autocomplete="username" />
+ class="input" value="" size="20" autocapitalize="off" autocomplete="username">
- class="input password-input" value="" size="20" autocomplete="current-password" spellcheck="false" />
+ class="input password-input" value="" size="20" autocomplete="current-password" spellcheck="false">
@@ -1410,29 +1410,29 @@ function wp_login_viewport_meta() {
do_action( 'login_form' );
?>
- />
+ >
-
+
-
+
-
+
-
+
-
+
@@ -1502,14 +1502,14 @@ function wp_login_viewport_meta() {
$login_script .= "if ( typeof wpOnload === 'function' ) { wpOnload() }";
?>
-
- \n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
@@ -138,8 +138,6 @@ public function test_wp_enqueue_script() {
* @ticket 42804
*/
public function test_wp_enqueue_script_with_html5_support_does_not_contain_type_attribute() {
- add_theme_support( 'html5', array( 'script' ) );
-
$GLOBALS['wp_scripts'] = new WP_Scripts();
$GLOBALS['wp_scripts']->default_version = classicpress_asset_version( 'script' );
@@ -167,24 +165,24 @@ public function test_protocols() {
// Try with an HTTP reference.
wp_enqueue_script( 'jquery-http', 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
- $expected .= "\n";
+ $expected .= "\n";
// Try with an HTTPS reference.
wp_enqueue_script( 'jquery-https', 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
- $expected .= "\n";
+ $expected .= "\n";
// Try with an automatic protocol reference (//).
wp_enqueue_script( 'jquery-doubleslash', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
- $expected .= "\n";
+ $expected .= "\n";
// Try with a local resource and an automatic protocol reference (//).
$url = '//my_plugin/script.js';
wp_enqueue_script( 'plugin-script', $url );
- $expected .= "\n";
+ $expected .= "\n";
// Try with a bad protocol.
wp_enqueue_script( 'jquery-ftp', 'ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
- $expected .= "\n";
+ $expected .= "\n";
// Go!
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
@@ -213,7 +211,7 @@ public function test_script_concatenation() {
$print_scripts = get_echo( '_print_scripts' );
$ver = self::$asset_version;
- $expected = "\n";
+ $expected = "\n";
$this->assertSame( $expected, $print_scripts );
}
@@ -227,8 +225,8 @@ public function test_wp_script_add_data_with_data_key() {
// Enqueue and add data.
wp_enqueue_script( 'test-only-data', 'example.com', array(), null );
wp_script_add_data( 'test-only-data', 'data', 'testing' );
- $expected = "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
// Go!
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
@@ -246,7 +244,7 @@ public function test_wp_script_add_data_with_conditional_key() {
// Enqueue and add conditional comments.
wp_enqueue_script( 'test-only-conditional', 'example.com', array(), null );
wp_script_add_data( 'test-only-conditional', 'conditional', 'gt IE 7' );
- $expected = "\n";
+ $expected = "\n";
// Go!
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
@@ -265,8 +263,8 @@ public function test_wp_script_add_data_with_data_and_conditional_keys() {
wp_enqueue_script( 'test-conditional-with-data', 'example.com', array(), null );
wp_script_add_data( 'test-conditional-with-data', 'data', 'testing' );
wp_script_add_data( 'test-conditional-with-data', 'conditional', 'lt IE 9' );
- $expected = "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
// Go!
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
@@ -284,7 +282,7 @@ public function test_wp_script_add_data_with_invalid_key() {
// Enqueue and add an invalid key.
wp_enqueue_script( 'test-invalid', 'example.com', array(), null );
wp_script_add_data( 'test-invalid', 'invalid', 'testing' );
- $expected = "\n";
+ $expected = "\n";
// Go!
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
@@ -307,8 +305,8 @@ public function test_wp_register_script() {
* @ticket 35229
*/
public function test_wp_register_script_with_handle_without_source() {
- $expected = "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
wp_register_script( 'handle-one', 'http://example.com', array(), 1 );
wp_register_script( 'handle-two', 'http://example.com', array(), 2 );
@@ -400,9 +398,9 @@ public function test_wp_register_script_with_dependencies_in_head_and_footer() {
$header = get_echo( 'wp_print_head_scripts' );
$footer = get_echo( 'wp_print_footer_scripts' );
- $expected_header = "\n";
- $expected_header .= "\n";
- $expected_footer = "\n";
+ $expected_header = "\n";
+ $expected_header .= "\n";
+ $expected_footer = "\n";
$this->assertSame( $expected_header, $header );
$this->assertSame( $expected_footer, $footer );
@@ -421,9 +419,9 @@ public function test_wp_register_script_with_dependencies_in_head_and_footer_in_
$header = get_echo( 'wp_print_head_scripts' );
$footer = get_echo( 'wp_print_footer_scripts' );
- $expected_header = "\n";
- $expected_footer = "\n";
- $expected_footer .= "\n";
+ $expected_header = "\n";
+ $expected_footer = "\n";
+ $expected_footer .= "\n";
$this->assertSame( $expected_header, $header );
$this->assertSame( $expected_footer, $footer );
@@ -447,14 +445,14 @@ public function test_wp_register_script_with_dependencies_in_head_and_footer_in_
$header = get_echo( 'wp_print_head_scripts' );
$footer = get_echo( 'wp_print_footer_scripts' );
- $expected_header = "\n";
- $expected_header .= "\n";
- $expected_header .= "\n";
- $expected_header .= "\n";
+ $expected_header = "\n";
+ $expected_header .= "\n";
+ $expected_header .= "\n";
+ $expected_header .= "\n";
- $expected_footer = "\n";
- $expected_footer .= "\n";
- $expected_footer .= "\n";
+ $expected_footer = "\n";
+ $expected_footer .= "\n";
+ $expected_footer .= "\n";
$this->assertSame( $expected_header, $header );
$this->assertSame( $expected_footer, $footer );
@@ -484,8 +482,8 @@ public function test_wp_add_inline_script_before() {
wp_enqueue_script( 'test-example', 'example.com', array(), null );
wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
- $expected = "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -497,8 +495,8 @@ public function test_wp_add_inline_script_after() {
wp_enqueue_script( 'test-example', 'example.com', array(), null );
wp_add_inline_script( 'test-example', 'console.log("after");' );
- $expected = "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -511,9 +509,9 @@ public function test_wp_add_inline_script_before_and_after() {
wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
wp_add_inline_script( 'test-example', 'console.log("after");' );
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -526,7 +524,7 @@ public function test_wp_add_inline_script_before_for_handle_without_source() {
wp_enqueue_script( 'test-example' );
wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
- $expected = "\n";
+ $expected = "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -539,7 +537,7 @@ public function test_wp_add_inline_script_after_for_handle_without_source() {
wp_enqueue_script( 'test-example' );
wp_add_inline_script( 'test-example', 'console.log("after");' );
- $expected = "\n";
+ $expected = "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -553,8 +551,8 @@ public function test_wp_add_inline_script_before_and_after_for_handle_without_so
wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
wp_add_inline_script( 'test-example', 'console.log("after");' );
- $expected = "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -569,9 +567,9 @@ public function test_wp_add_inline_script_multiple() {
wp_add_inline_script( 'test-example', 'console.log("after");' );
wp_add_inline_script( 'test-example', 'console.log("after");' );
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -585,10 +583,10 @@ public function test_wp_add_inline_script_localized_data_is_added_first() {
wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
wp_add_inline_script( 'test-example', 'console.log("after");' );
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -610,11 +608,11 @@ public function test_wp_add_inline_script_before_with_concat() {
wp_add_inline_script( 'two', 'console.log("before two");', 'before' );
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -635,10 +633,10 @@ public function test_wp_add_inline_script_before_with_concat2() {
wp_add_inline_script( 'one', 'console.log("before one");', 'before' );
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -661,12 +659,12 @@ public function test_wp_add_inline_script_after_with_concat() {
wp_add_inline_script( 'three', 'console.log("after three");' );
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -681,13 +679,13 @@ public function test_wp_add_inline_script_after_and_before_with_concat_and_condi
$wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php.
$expected_localized = "\n";
$expected = "\n";
wp_enqueue_script( 'test-example', 'example.com', array(), null );
@@ -713,9 +711,9 @@ public function test_wp_add_inline_script_after_with_concat_and_core_dependency(
$wp_scripts->do_concat = true;
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null );
wp_add_inline_script( 'test-example', 'console.log("after");' );
@@ -738,10 +736,10 @@ public function test_wp_add_inline_script_after_with_concat_and_conditional_and_
$wp_scripts->do_concat = true;
$ver = self::$asset_version;
- $expected = "\n";
+ $expected = "\n";
$expected .= "\n";
wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null );
@@ -767,9 +765,9 @@ public function test_wp_add_inline_script_before_with_concat_and_core_dependency
$wp_scripts->do_concat = true;
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null );
wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
@@ -794,16 +792,16 @@ public function test_wp_add_inline_script_before_after_concat_with_core_dependen
$ver = self::$asset_version;
$suffix = wp_scripts_get_suffix();
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null );
wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
@@ -832,8 +830,8 @@ public function test_wp_add_inline_script_customize_dependency() {
$wp_scripts->base_url = '';
$wp_scripts->do_concat = true;
- $expected_tail = "\n";
- $expected_tail .= "\n";
+ $expected_tail .= "\n";
@@ -848,7 +846,7 @@ public function test_wp_add_inline_script_customize_dependency() {
_print_scripts();
$print_scripts = $this->getActualOutput();
- $tail = substr( $print_scripts, strrpos( $print_scripts, "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -893,10 +891,10 @@ public function test_wp_add_inline_script_before_third_core_script_prints_two_co
wp_enqueue_script( 'four', '/wp-includes/js/script4.js' );
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -1279,8 +1277,8 @@ public function test_wp_localize_script_data_formats( $l10n_data, $expected ) {
wp_enqueue_script( 'test-example', 'example.com', array(), null );
wp_localize_script( 'test-example', 'testExample', $l10n_data );
- $expected = "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
}
@@ -1343,9 +1341,9 @@ function () {
// The non-default script should end concatenation and maintain order.
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, $print_scripts );
}
diff --git a/tests/phpunit/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php
index 9085bb40e9..d86fcff061 100644
--- a/tests/phpunit/tests/dependencies/styles.php
+++ b/tests/phpunit/tests/dependencies/styles.php
@@ -91,10 +91,10 @@ public function test_wp_enqueue_style() {
$ver = self::$asset_version;
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
- $expected .= "\n";
+ $expected = "\n";
+ $expected .= "\n";
+ $expected .= "\n";
+ $expected .= "\n";
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
@@ -106,7 +106,7 @@ public function test_wp_enqueue_style_override_default_version() {
$ver = 'aaaa';
$GLOBALS['wp_styles']->default_version = $ver;
wp_enqueue_style( 'override-default-version', 'example.com' );
- $expected = "\n";
+ $expected = "\n";
$this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );
$this->assertEquals(
array(
@@ -126,7 +126,7 @@ public function test_wp_enqueue_style_override_default_version_and_filter() {
$GLOBALS['wp_styles']->default_version = 'aaaa';
$this->classicpress_asset_version_override = $ver;
wp_enqueue_style( 'override-default-version-and-filter', 'example.com' );
- $expected = "\n";
+ $expected = "\n";
$this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );
$this->assertEquals(
array(
@@ -145,7 +145,7 @@ public function test_wp_enqueue_style_filter_default_version() {
$ver = 'cccc';
$this->classicpress_asset_version_override = $ver;
wp_enqueue_style( 'filter-default-version', 'example.com' );
- $expected = "\n";
+ $expected = "\n";
$this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );
$this->assertEquals(
array(
@@ -163,7 +163,7 @@ public function test_wp_enqueue_style_filter_default_version() {
public function test_wp_enqueue_style_filter_declared_version() {
$this->classicpress_asset_version_override = 'oooo';
wp_enqueue_style( 'filter-declared-version', 'example.com', array(), 'dddd' );
- $expected = "\n";
+ $expected = "\n";
$this->assertEquals( $expected, get_echo( 'wp_print_styles' ) );
$this->assertEquals(
array(
@@ -181,7 +181,7 @@ public function test_wp_enqueue_style_filter_declared_version() {
public function test_wp_enqueue_style_filter_null_version() {
$this->classicpress_asset_version_override = 'oooo';
wp_enqueue_style( 'filter-null-version', 'example.com', array(), null );
- $expected = "\n";
+ $expected = "\n";
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
$this->assertSame(
array(
@@ -200,15 +200,13 @@ public function test_wp_enqueue_style_filter_null_version() {
* @ticket 42804
*/
public function test_wp_enqueue_style_with_html5_support_does_not_contain_type_attribute() {
- add_theme_support( 'html5', array( 'style' ) );
-
$GLOBALS['wp_styles'] = new WP_Styles();
$GLOBALS['wp_styles']->default_version = classicpress_asset_version( 'style' );
wp_enqueue_style( 'no-deps-no-version', 'example.com' );
$ver = classicpress_asset_version( 'style' );
- $expected = "\n";
+ $expected = "\n";
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
}
@@ -229,24 +227,24 @@ public function test_protocols() {
// Try with an HTTP reference.
wp_enqueue_style( 'reset-css-http', 'http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );
- $expected .= "\n";
+ $expected .= "\n";
// Try with an HTTPS reference.
wp_enqueue_style( 'reset-css-https', 'http://yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );
- $expected .= "\n";
+ $expected .= "\n";
// Try with an automatic protocol reference (//).
wp_enqueue_style( 'reset-css-doubleslash', '//yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );
- $expected .= "\n";
+ $expected .= "\n";
// Try with a local resource and an automatic protocol reference (//).
$url = '//my_plugin/style.css';
wp_enqueue_style( 'plugin-style', $url );
- $expected .= "\n";
+ $expected .= "\n";
// Try with a bad protocol.
wp_enqueue_style( 'reset-css-ftp', 'ftp://yui.yahooapis.com/2.8.1/build/reset/reset-min.css' );
- $expected .= "\n";
+ $expected .= "\n";
// Go!
$this->assertSame( $expected, get_echo( 'wp_print_styles' ) );
@@ -269,8 +267,8 @@ public function test_inline_styles() {
$style .= "\tbackground: red;\n";
$style .= '}';
- $expected = "\n";
- $expected .= "\n";
@@ -298,8 +296,8 @@ public function test_inline_styles_concat() {
$style .= "\tbackground: red;\n";
$style .= '}';
- $expected = "\n";
- $expected .= "\n";
@@ -379,8 +377,8 @@ public function test_multiple_inline_styles() {
$style2 .= "\tbackground: blue;\n";
$style2 .= '}';
- $expected = "\n";
- $expected .= "\n";
@@ -401,13 +399,13 @@ public function test_multiple_inline_styles() {
*/
public function test_plugin_doing_inline_styles_wrong() {
- $style = "';
- $expected = "\n";
+ $expected = "\n";
$expected .= "$style\n";
wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
@@ -424,7 +422,7 @@ public function test_plugin_doing_inline_styles_wrong() {
*/
public function test_unnecessary_style_tags() {
- $expected = "\n";
+ $expected = "\n";
wp_enqueue_style( 'handle', 'http://example.com', array(), 1 );
@@ -438,8 +436,8 @@ public function test_unnecessary_style_tags() {
public function test_conditional_inline_styles_are_also_conditional() {
$expected = <<
-
-
@@ -468,9 +466,9 @@ public function test_wp_register_style() {
public function test_wp_add_inline_style_for_handle_without_source() {
$style = 'a { color: blue; }';
- $expected = "\n";
- $expected .= "\n";
- $expected .= "\n";
diff --git a/tests/phpunit/tests/dependencies/wpInlineScriptTag.php b/tests/phpunit/tests/dependencies/wpInlineScriptTag.php
index 1e517b637d..48e0dfe2eb 100644
--- a/tests/phpunit/tests/dependencies/wpInlineScriptTag.php
+++ b/tests/phpunit/tests/dependencies/wpInlineScriptTag.php
@@ -20,8 +20,6 @@ class Tests_Functions_wpInlineScriptTag extends WP_UnitTestCase {
JS;
public function get_inline_script_tag_type_set() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
'\n",
wp_get_inline_script_tag(
@@ -34,8 +32,6 @@ public function get_inline_script_tag_type_set() {
)
);
- remove_theme_support( 'html5' );
-
$this->assertSame(
'\n",
wp_get_inline_script_tag(
@@ -50,8 +46,6 @@ public function get_inline_script_tag_type_set() {
}
public function test_get_inline_script_tag_type_not_set() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
"\n",
wp_get_inline_script_tag(
@@ -62,19 +56,13 @@ public function test_get_inline_script_tag_type_not_set() {
)
)
);
-
- remove_theme_support( 'html5' );
}
public function test_get_inline_script_tag_unescaped_src() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
"\n",
wp_get_inline_script_tag( $this->event_handler )
);
-
- remove_theme_support( 'html5' );
}
public function test_print_script_tag_prints_get_inline_script_tag() {
@@ -88,8 +76,6 @@ static function ( $attributes ) {
}
);
- add_theme_support( 'html5', array( 'script' ) );
-
$attributes = array(
'id' => 'utils-js-before',
'nomodule' => true,
@@ -106,8 +92,6 @@ static function ( $attributes ) {
)
);
- remove_theme_support( 'html5' );
-
$this->assertSame(
wp_get_inline_script_tag( $this->event_handler, $attributes ),
get_echo(
diff --git a/tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php b/tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php
index 3ff79fc5d8..cfad2047e4 100644
--- a/tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php
+++ b/tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php
@@ -10,8 +10,6 @@
class Tests_Functions_wpSanitizeScriptAttributes extends WP_UnitTestCase {
public function test_sanitize_script_attributes_type_set() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
' type="application/javascript" src="https://DOMAIN.TLD/PATH/FILE.js" nomodule',
wp_sanitize_script_attributes(
@@ -24,10 +22,8 @@ public function test_sanitize_script_attributes_type_set() {
)
);
- remove_theme_support( 'html5' );
-
$this->assertSame(
- ' src="https://DOMAIN.TLD/PATH/FILE.js" type="application/javascript" nomodule="nomodule"',
+ ' src="https://DOMAIN.TLD/PATH/FILE.js" type="application/javascript" nomodule',
wp_sanitize_script_attributes(
array(
'src' => 'https://DOMAIN.TLD/PATH/FILE.js',
@@ -40,8 +36,6 @@ public function test_sanitize_script_attributes_type_set() {
}
public function test_sanitize_script_attributes_type_not_set() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
' src="https://DOMAIN.TLD/PATH/FILE.js" nomodule',
wp_sanitize_script_attributes(
@@ -53,10 +47,8 @@ public function test_sanitize_script_attributes_type_not_set() {
)
);
- remove_theme_support( 'html5' );
-
$this->assertSame(
- ' src="https://DOMAIN.TLD/PATH/FILE.js" nomodule="nomodule"',
+ ' src="https://DOMAIN.TLD/PATH/FILE.js" nomodule',
wp_sanitize_script_attributes(
array(
'src' => 'https://DOMAIN.TLD/PATH/FILE.js',
@@ -69,19 +61,13 @@ public function test_sanitize_script_attributes_type_not_set() {
public function test_sanitize_script_attributes_no_attributes() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
'',
wp_sanitize_script_attributes( array() )
);
-
- remove_theme_support( 'html5' );
}
public function test_sanitize_script_attributes_relative_src() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
' src="PATH/FILE.js" nomodule',
wp_sanitize_script_attributes(
@@ -92,14 +78,10 @@ public function test_sanitize_script_attributes_relative_src() {
)
)
);
-
- remove_theme_support( 'html5' );
}
public function test_sanitize_script_attributes_only_false_boolean_attributes() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
'',
wp_sanitize_script_attributes(
@@ -109,13 +91,9 @@ public function test_sanitize_script_attributes_only_false_boolean_attributes()
)
)
);
-
- remove_theme_support( 'html5' );
}
public function test_sanitize_script_attributes_only_true_boolean_attributes() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
' async nomodule',
wp_sanitize_script_attributes(
@@ -125,7 +103,5 @@ public function test_sanitize_script_attributes_only_true_boolean_attributes() {
)
)
);
-
- remove_theme_support( 'html5' );
}
}
diff --git a/tests/phpunit/tests/dependencies/wpScriptTag.php b/tests/phpunit/tests/dependencies/wpScriptTag.php
index ee273f8fb3..c36ba35aa1 100644
--- a/tests/phpunit/tests/dependencies/wpScriptTag.php
+++ b/tests/phpunit/tests/dependencies/wpScriptTag.php
@@ -9,8 +9,6 @@
class Tests_Functions_wpScriptTag extends WP_UnitTestCase {
public function get_script_tag_type_set() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
'' . "\n",
wp_get_script_tag(
@@ -23,8 +21,6 @@ public function get_script_tag_type_set() {
)
);
- remove_theme_support( 'html5' );
-
$this->assertSame(
'' . "\n",
wp_get_script_tag(
@@ -42,8 +38,6 @@ public function get_script_tag_type_set() {
* @covers ::wp_get_script_tag
*/
public function test_get_script_tag_type_not_set() {
- add_theme_support( 'html5', array( 'script' ) );
-
$this->assertSame(
'' . "\n",
wp_get_script_tag(
@@ -54,8 +48,6 @@ public function test_get_script_tag_type_not_set() {
)
)
);
-
- remove_theme_support( 'html5' );
}
/**
@@ -72,8 +64,6 @@ static function ( $attributes ) {
}
);
- add_theme_support( 'html5', array( 'script' ) );
-
$attributes = array(
'src' => 'https://localhost/PATH/FILE.js',
'id' => 'utils-js-extra',
@@ -88,8 +78,6 @@ static function ( $attributes ) {
)
);
- remove_theme_support( 'html5' );
-
$this->assertSame(
wp_get_script_tag( $attributes ),
get_echo(
diff --git a/tests/phpunit/tests/formatting/Emoji.php b/tests/phpunit/tests/formatting/Emoji.php
index 5d046d7dfe..b3556f2264 100644
--- a/tests/phpunit/tests/formatting/Emoji.php
+++ b/tests/phpunit/tests/formatting/Emoji.php
@@ -132,17 +132,17 @@ public function data_wp_staticize_emoji() {
array(
// Simple emoji.
'🙂',
- '
',
+ '',
),
array(
// Skin tone, gender, ZWJ, emoji selector.
'👮🏼♀️',
- '
',
+ '',
),
array(
// Unicode 10.
'🧚',
- '
',
+ '',
),
);
diff --git a/tests/phpunit/tests/formatting/convertSmilies.php b/tests/phpunit/tests/formatting/convertSmilies.php
index 5031b4b51c..def0e24b7a 100644
--- a/tests/phpunit/tests/formatting/convertSmilies.php
+++ b/tests/phpunit/tests/formatting/convertSmilies.php
@@ -19,7 +19,7 @@ public function get_smilies_input_output() {
return array(
array(
'Lorem ipsum dolor sit amet mauris ;-) Praesent gravida sodales. :lol: Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, :eek: mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, :mrgreen: tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus :?:',
- "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x86 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xae mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, ![\":mrgreen:\"](\"{$includes_path}mrgreen.png\")
tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93",
+ "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x86 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xae mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93",
),
array(
'Welcome to the jungle! We got fun n games! :) We got everything you want 8-) Honey we know the names :)',
@@ -75,15 +75,15 @@ public function get_custom_smilies_input_output() {
return array(
array(
'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. :monkey:',
- 'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. 
',
+ 'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. ',
),
array(
'Star Wars Jedi Knight :arrow: Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. :nervou:',
- 'Star Wars Jedi Knight 
Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. 
',
+ 'Star Wars Jedi Knight Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. ',
),
array(
- ':arrow: monkey: Lorem ipsum dolor sit amet enim. Etiam ullam :PP
corper. Suspendisse a pellentesque dui, non felis. :arrow: :arrow',
- ' monkey: Lorem ipsum dolor sit amet enim. Etiam ullam 
corper. Suspendisse a pellentesque dui, non felis. :arrow',
+ ':arrow: monkey: Lorem ipsum dolor sit amet enim. Etiam ullam :PP
corper. Suspendisse a pellentesque dui, non felis. :arrow: :arrow',
+ ' monkey: Lorem ipsum dolor sit amet enim. Etiam ullam
corper. Suspendisse a pellentesque dui, non felis. :arrow',
),
);
}
@@ -190,7 +190,7 @@ public function get_smilies_combinations() {
),
array(
'8O :twisted: :( :? :roll: :mrgreen:',
- "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x99\x81 \xf0\x9f\x98\x95 \xf0\x9f\x99\x84 ",
+ "\xf0\x9f\x98\xaf \xf0\x9f\x98\x88 \xf0\x9f\x99\x81 \xf0\x9f\x98\x95 \xf0\x9f\x99\x84 ",
),
);
}
@@ -228,11 +228,11 @@ public function get_single_smilies_input_output() {
),
array(
'8O :) additional text here :)',
- '8O 
additional text here ',
+ '8O additional text here ',
),
array(
':) :) :) :)',
- ' ',
+ ' ',
),
);
}
diff --git a/tests/phpunit/tests/formatting/wpAutop.php b/tests/phpunit/tests/formatting/wpAutop.php
index 6630782963..00c2a91a48 100644
--- a/tests/phpunit/tests/formatting/wpAutop.php
+++ b/tests/phpunit/tests/formatting/wpAutop.php
@@ -16,8 +16,8 @@ public function test_first_post() {
-As a subscriber, you will receive an email every time an update is available (and only then). This will make it easier to keep your site up to date, and secure from evildoers.
-When a new version is released, log in to the Dashboard and follow the instructions.
+
As a subscriber, you will receive an email every time an update is available (and only then). This will make it easier to keep your site up to date, and secure from evildoers.
+When a new version is released, log in to the Dashboard and follow the instructions.
Upgrading is a couple of clicks!
Then you can start enjoying the WordPress experience:
@@ -89,8 +89,8 @@ public function test_skip_pre_elements() {
$this->assertSame( $expected, trim( wpautop( $str ) ) );
// Make sure HTML breaks are maintained if manually inserted.
- $str = "Look at this code\n\n
Line1
Line2
Line3
Line4\nActual Line 2\nActual Line 3
\n\nCool, huh?";
- $expected = "Look at this code
\nLine1
Line2
Line3
Line4\nActual Line 2\nActual Line 3
\nCool, huh?
";
+ $str = "Look at this code\n\nLine1
Line2
Line3
Line4\nActual Line 2\nActual Line 3
\n\nCool, huh?";
+ $expected = "Look at this code
\nLine1
Line2
Line3
Line4\nActual Line 2\nActual Line 3
\nCool, huh?
";
$this->assertSame( $expected, trim( wpautop( $str ) ) );
}
@@ -100,7 +100,7 @@ public function test_skip_pre_elements() {
* @ticket 16456
*/
public function test_skip_input_elements() {
- $str = 'Username:
Password: ';
+ $str = 'Username:
Password: ';
$this->assertSame( "$str
", trim( wpautop( $str ) ) );
}
@@ -544,7 +544,7 @@ public function data_element_sanity() {
}
/**
- * wpautop() should not convert line breaks after
tags
+ * wpautop() should not convert line breaks after
tags
*
* @ticket 33377
*/
@@ -552,22 +552,22 @@ public function test_that_wpautop_skips_line_breaks_after_br() {
$content = '
line 1
line 2
-line 3
+line 3
line 4
line 5
';
- $expected = 'line 1
-line 2
-line 3
-line 4
+ $expected = '
line 1
+line 2
+line 3
+line 4
line 5
';
$this->assertSameIgnoreEOL( $expected, trim( wpautop( $content ) ) );
}
/**
- * wpautop() should convert multiple line breaks into a paragraph regarless of
format
+ * wpautop() should convert multiple line breaks into a paragraph regarless of
format
*
* @ticket 33377
*/
@@ -576,7 +576,7 @@ public function test_that_wpautop_adds_a_paragraph_after_multiple_br() {
line 1
line 2
-
+
';
$expected = 'line 1
diff --git a/tests/phpunit/tests/functions/wpNonceField.php b/tests/phpunit/tests/functions/wpNonceField.php
index 78116f01e5..91d7800041 100644
--- a/tests/phpunit/tests/functions/wpNonceField.php
+++ b/tests/phpunit/tests/functions/wpNonceField.php
@@ -16,8 +16,8 @@ class Tests_Functions_wpNonceField extends WP_UnitTestCase {
public function test_wp_nonce_field() {
wp_nonce_field();
$this->expectOutputRegex(
- '#^' .
- '$#'
+ '#^' .
+ '$#'
);
}
@@ -52,38 +52,38 @@ public function data_wp_nonce_field() {
'name' => '_wpnonce',
'referer' => true,
'expected_regexp' =>
- '#^' .
- '$#',
+ '#^' .
+ '$#',
),
'action_name' => array(
'action' => 'action_name',
'name' => '_wpnonce',
'referer' => true,
'expected_regexp' =>
- '#^' .
- '$#',
+ '#^' .
+ '$#',
),
'nonce_name' => array(
'action' => -1,
'name' => 'nonce_name',
'referer' => true,
'expected_regexp' =>
- '#^' .
- '$#',
+ '#^' .
+ '$#',
),
'no_referer' => array(
'action' => -1,
'name' => '_wpnonce',
'referer' => false,
'expected_regexp' =>
- '#^$#',
+ '#^$#',
),
'& in name' => array(
'action' => -1,
'name' => 'a&b',
'referer' => false,
'expected_regexp' =>
- '#^$#',
+ '#^$#',
),
);
}
diff --git a/tests/phpunit/tests/functions/wpRefererField.php b/tests/phpunit/tests/functions/wpRefererField.php
index 227fee71f4..39ebbffc6f 100644
--- a/tests/phpunit/tests/functions/wpRefererField.php
+++ b/tests/phpunit/tests/functions/wpRefererField.php
@@ -17,7 +17,7 @@ public function test_wp_referer_field() {
$_SERVER['REQUEST_URI'] = '/test/';
wp_referer_field();
- $this->expectOutputString( '' );
+ $this->expectOutputString( '' );
}
/**
@@ -26,7 +26,7 @@ public function test_wp_referer_field() {
public function test_wp_referer_field_return() {
$_SERVER['REQUEST_URI'] = '/test/';
- $this->assertSame( '', wp_referer_field( false ) );
+ $this->assertSame( '', wp_referer_field( false ) );
}
/**
@@ -41,7 +41,7 @@ public function test_wp_referer_field_return() {
public function test_wp_referer_field_should_respect_display_arg( $display ) {
$actual = $display ? get_echo( 'wp_referer_field' ) : wp_referer_field( false );
- $this->assertSame( '', $actual );
+ $this->assertSame( '', $actual );
}
/**
@@ -72,6 +72,6 @@ public function test_wp_referer_field_with_referer() {
$_SERVER['REQUEST_URI'] = $old_request_uri;
- $this->assertSame( '', $actual );
+ $this->assertSame( '', $actual );
}
}
diff --git a/tests/phpunit/tests/general/feedLinksExtra.php b/tests/phpunit/tests/general/feedLinksExtra.php
index b59a233c95..8dca86b49c 100644
--- a/tests/phpunit/tests/general/feedLinksExtra.php
+++ b/tests/phpunit/tests/general/feedLinksExtra.php
@@ -196,7 +196,7 @@ public function test_feed_links_extra( $title, $type, array $args = array() ) {
}
$expected = sprintf(
- '' . "\n",
+ '' . "\n",
esc_attr( $title ),
esc_url( $feed_link )
);
@@ -440,7 +440,7 @@ public function test_feed_links_extra_should_respect_comments_open() {
$expected = '' . "\n";
+ $expected .= ' href="http://example.org/?feed=rss2&p=' . self::$post_no_comment_id . '">' . "\n";
$this->assertSame( $expected, get_echo( 'feed_links_extra' ) );
}
@@ -455,7 +455,7 @@ public function test_feed_links_extra_should_respect_pings_open() {
$expected = '' . "\n";
+ $expected .= ' href="http://example.org/?feed=rss2&p=' . self::$post_no_comment_id . '">' . "\n";
$this->assertSame( $expected, get_echo( 'feed_links_extra' ) );
}
@@ -470,7 +470,7 @@ public function test_feed_links_extra_should_respect_post_comment_count() {
$expected = '' . "\n";
+ $expected .= ' href="http://example.org/?feed=rss2&p=' . self::$post_with_comment_id . '">' . "\n";
$this->assertSame( $expected, get_echo( 'feed_links_extra' ) );
}
@@ -507,7 +507,7 @@ static function () {
$expected = '' . "\n";
+ $expected .= ' href="http://example.org/?feed=foo&p=' . self::$post_with_comment_id . '">' . "\n";
$this->assertSame( $expected, get_echo( 'feed_links_extra' ) );
}
diff --git a/tests/phpunit/tests/general/template.php b/tests/phpunit/tests/general/template.php
index 79cf3a3f33..eacbf839bb 100644
--- a/tests/phpunit/tests/general/template.php
+++ b/tests/phpunit/tests/general/template.php
@@ -137,10 +137,10 @@ public function test_wp_site_icon() {
$this->set_site_icon();
$output = array(
- sprintf( '', esc_url( get_site_icon_url( 32 ) ) ),
- sprintf( '', esc_url( get_site_icon_url( 192 ) ) ),
- sprintf( '', esc_url( get_site_icon_url( 180 ) ) ),
- sprintf( '', esc_url( get_site_icon_url( 270 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 32 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 192 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 180 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 270 ) ) ),
'',
);
$output = implode( "\n", $output );
@@ -160,11 +160,11 @@ public function test_wp_site_icon_with_filter() {
$this->set_site_icon();
$output = array(
- sprintf( '', esc_url( get_site_icon_url( 32 ) ) ),
- sprintf( '', esc_url( get_site_icon_url( 192 ) ) ),
- sprintf( '', esc_url( get_site_icon_url( 180 ) ) ),
- sprintf( '', esc_url( get_site_icon_url( 270 ) ) ),
- sprintf( '', esc_url( get_site_icon_url( 150 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 32 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 192 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 180 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 270 ) ) ),
+ sprintf( '', esc_url( get_site_icon_url( 150 ) ) ),
'',
);
$output = implode( "\n", $output );
@@ -189,7 +189,7 @@ public function test_customize_preview_wp_site_icon_empty() {
$wp_customize->register_controls();
$wp_customize->start_previewing_theme();
- $this->expectOutputString( '' . "\n" );
+ $this->expectOutputString( '' . "\n" );
wp_site_icon();
}
@@ -211,10 +211,10 @@ public function test_customize_preview_wp_site_icon_dirty() {
$wp_customize->set_post_value( 'site_icon', $attachment_id );
$wp_customize->get_setting( 'site_icon' )->preview();
$output = array(
- sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 32 ) ) ),
- sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 192 ) ) ),
- sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 180 ) ) ),
- sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 270 ) ) ),
+ sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 32 ) ) ),
+ sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 192 ) ) ),
+ sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 180 ) ) ),
+ sprintf( '', esc_url( wp_get_attachment_image_url( $attachment_id, 270 ) ) ),
'',
);
$output = implode( "\n", $output );
@@ -231,7 +231,7 @@ public function test_customize_preview_wp_site_icon_dirty() {
* @return array
*/
public function custom_site_icon_meta_tag( $meta_tags ) {
- $meta_tags[] = sprintf( '', esc_url( get_site_icon_url( 150 ) ) );
+ $meta_tags[] = sprintf( '', esc_url( get_site_icon_url( 150 ) ) );
return $meta_tags;
}
diff --git a/tests/phpunit/tests/general/template_CheckedSelectedHelper.php b/tests/phpunit/tests/general/template_CheckedSelectedHelper.php
index 2c3afa9a80..0b93106521 100644
--- a/tests/phpunit/tests/general/template_CheckedSelectedHelper.php
+++ b/tests/phpunit/tests/general/template_CheckedSelectedHelper.php
@@ -28,7 +28,7 @@ class Tests_General_Template_CheckedSelectedHelper extends WP_UnitTestCase {
* @covers ::selected
*/
public function test_selected_with_equal_values() {
- $this->assertSame( " selected='selected'", selected( 'foo', 'foo', false ) );
+ $this->assertSame( ' selected', selected( 'foo', 'foo', false ) );
}
/**
@@ -38,7 +38,7 @@ public function test_selected_with_equal_values() {
* @covers ::checked
*/
public function test_checked_with_equal_values() {
- $this->assertSame( " checked='checked'", checked( 'foo', 'foo', false ) );
+ $this->assertSame( ' checked', checked( 'foo', 'foo', false ) );
}
/**
@@ -48,7 +48,7 @@ public function test_checked_with_equal_values() {
* @covers ::disabled
*/
public function test_disabled_with_equal_values() {
- $this->assertSame( " disabled='disabled'", disabled( 'foo', 'foo', false ) );
+ $this->assertSame( ' disabled', disabled( 'foo', 'foo', false ) );
}
/**
@@ -66,7 +66,7 @@ public function test_readonly_with_equal_values() {
// Call the function via a variable to prevent a parse error for this file on PHP 8.1.
$fn = 'readonly';
- $this->assertSame( " readonly='readonly'", $fn( 'foo', 'foo', false ) );
+ $this->assertSame( ' readonly', $fn( 'foo', 'foo', false ) );
}
/**
@@ -76,7 +76,7 @@ public function test_readonly_with_equal_values() {
* @covers ::wp_readonly
*/
public function test_wp_readonly_with_equal_values() {
- $this->assertSame( " readonly='readonly'", wp_readonly( 'foo', 'foo', false ) );
+ $this->assertSame( ' readonly', wp_readonly( 'foo', 'foo', false ) );
}
/**
@@ -91,7 +91,7 @@ public function test_wp_readonly_with_equal_values() {
* @param mixed $current The other value to compare.
*/
public function test_checked_selected_helper_with_equal_values( $helper, $current ) {
- $this->assertSame( " test='test'", __checked_selected_helper( $helper, $current, false, 'test' ) );
+ $this->assertSame( ' test', __checked_selected_helper( $helper, $current, false, 'test' ) );
}
/**
@@ -171,7 +171,7 @@ public function data_non_equal_values() {
* @covers ::__checked_selected_helper
*/
public function test_checked_selected_helper_echoes_result_by_default() {
- $expected = " disabled='disabled'";
+ $expected = ' disabled';
$this->expectOutputString( $expected );
$this->assertSame( $expected, disabled( 'foo', 'foo' ) );
}
@@ -196,10 +196,10 @@ public function test_checked_selected_helper_default_value_for_second_parameter(
$expected = '';
if ( false !== $expect_output ) {
- $expected = " {$fn}='{$fn}'";
+ $expected = " {$fn}";
if ( 'wp_readonly' === $fn ) {
// Account for the function name not matching the expected output string.
- $expected = " readonly='readonly'";
+ $expected = ' readonly';
}
// Only set output expectation when output is expected, so the test will fail on unexpected output.
diff --git a/tests/phpunit/tests/general/wpPreloadResources.php b/tests/phpunit/tests/general/wpPreloadResources.php
index 25865bb047..729441e480 100644
--- a/tests/phpunit/tests/general/wpPreloadResources.php
+++ b/tests/phpunit/tests/general/wpPreloadResources.php
@@ -33,7 +33,7 @@ public function test_preload_resources( $expected, $preload_resources ) {
public function data_preload_resources() {
return array(
'basic_preload' => array(
- 'expected' => "\n",
+ 'expected' => "\n",
'urls' => array(
array(
'href' => 'https://example.com/style.css',
@@ -42,8 +42,8 @@ public function data_preload_resources() {
),
),
'multiple_links' => array(
- 'expected' => "\n" .
- "\n",
+ 'expected' => "\n" .
+ "\n",
'urls' => array(
array(
'href' => 'https://example.com/style.css',
@@ -56,9 +56,9 @@ public function data_preload_resources() {
),
),
'MIME_types' => array(
- 'expected' => "\n" .
- "\n" .
- "\n",
+ 'expected' => "\n" .
+ "\n" .
+ "\n",
'urls' => array(
array(
// Should ignore not valid attributes.
@@ -78,10 +78,10 @@ public function data_preload_resources() {
),
),
'CORS' => array(
- 'expected' => "\n" .
- "\n" .
- "\n" .
- "\n",
+ 'expected' => "\n" .
+ "\n" .
+ "\n" .
+ "\n",
'urls' => array(
array(
'href' => 'https://example.com/style.css',
@@ -108,12 +108,12 @@ public function data_preload_resources() {
),
),
'media' => array(
- 'expected' => "\n" .
- "\n" .
- "\n" .
- "\n" .
- "\n" .
- "\n",
+ 'expected' => "\n" .
+ "\n" .
+ "\n" .
+ "\n" .
+ "\n" .
+ "\n",
'urls' => array(
array(
'href' => 'https://example.com/style.css',
@@ -155,14 +155,14 @@ public function data_preload_resources() {
),
),
'media_extra_attributes' => array(
- 'expected' => "\n" .
- "\n" .
- "\n" .
- "\n" .
- "\n" .
- "\n" .
- "\n" .
- "\n",
+ 'expected' => "\n" .
+ "\n" .
+ "\n" .
+ "\n" .
+ "\n" .
+ "\n" .
+ "\n" .
+ "\n",
'urls' => array(
array(
'href' => 'https://example.com/style.css',
diff --git a/tests/phpunit/tests/general/wpResourceHints.php b/tests/phpunit/tests/general/wpResourceHints.php
index d0ece5d9ac..654d397c70 100644
--- a/tests/phpunit/tests/general/wpResourceHints.php
+++ b/tests/phpunit/tests/general/wpResourceHints.php
@@ -31,9 +31,9 @@ public function tear_down() {
}
public function test_dns_prefetching() {
- $expected = "\n" .
- "\n" .
- "\n";
+ $expected = "\n" .
+ "\n" .
+ "\n";
add_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch_domains' ), 10, 2 );
@@ -61,10 +61,10 @@ public function add_dns_prefetch_domains( $hints, $method ) {
* @ticket 37652
*/
public function test_preconnect() {
- $expected = "\n" .
- "\n" .
- "\n" .
- "\n";
+ $expected = "\n" .
+ "\n" .
+ "\n" .
+ "\n";
add_filter( 'wp_resource_hints', array( $this, 'add_preconnect_domains' ), 10, 2 );
@@ -88,9 +88,9 @@ public function add_preconnect_domains( $hints, $method ) {
}
public function test_prerender() {
- $expected = "\n" .
- "\n" .
- "\n";
+ $expected = "\n" .
+ "\n" .
+ "\n";
add_filter( 'wp_resource_hints', array( $this, 'add_prerender_urls' ), 10, 2 );
@@ -113,7 +113,7 @@ public function add_prerender_urls( $hints, $method ) {
}
public function test_parse_url_dns_prefetch() {
- $expected = "\n";
+ $expected = "\n";
add_filter( 'wp_resource_hints', array( $this, 'add_dns_prefetch_long_urls' ), 10, 2 );
@@ -133,7 +133,7 @@ public function add_dns_prefetch_long_urls( $hints, $method ) {
}
public function test_dns_prefetch_styles() {
- $expected = "\n";
+ $expected = "\n";
$args = array(
'family' => 'Open+Sans:400',
@@ -150,7 +150,7 @@ public function test_dns_prefetch_styles() {
}
public function test_dns_prefetch_scripts() {
- $expected = "\n";
+ $expected = "\n";
$args = array(
'family' => 'Open+Sans:400',
@@ -171,7 +171,7 @@ public function test_dns_prefetch_scripts() {
*/
public function test_dns_prefetch_scripts_does_not_include_registered_only() {
$expected = '';
- $unexpected = "\n";
+ $unexpected = "\n";
wp_register_script( 'jquery-elsewhere', 'https://wordpress.org/wp-includes/js/jquery/jquery.js' );
@@ -235,10 +235,10 @@ public function add_malformed_url_unsupported_scheme( $hints, $method ) {
* @ticket 38121
*/
public function test_custom_attributes() {
- $expected = "\n" .
- "\n" .
- "\n" .
- "\n";
+ $expected = "\n" .
+ "\n" .
+ "\n" .
+ "\n";
add_filter( 'wp_resource_hints', array( $this, 'add_url_with_attributes' ), 10, 2 );
diff --git a/tests/phpunit/tests/l10n.php b/tests/phpunit/tests/l10n.php
index 1c69fb4c23..4a6d2b54a0 100644
--- a/tests/phpunit/tests/l10n.php
+++ b/tests/phpunit/tests/l10n.php
@@ -116,7 +116,7 @@ public function test_wp_dropdown_languages() {
$this->assertStringContainsString( 'id="foo"', $actual );
$this->assertStringContainsString( 'name="bar"', $actual );
$this->assertStringContainsString( '', $actual );
- $this->assertStringContainsString( '', $actual );
+ $this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
}
@@ -142,7 +142,7 @@ public function test_wp_dropdown_languages_site_default() {
$this->assertStringContainsString( 'name="bar"', $actual );
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
- $this->assertStringContainsString( '', $actual );
+ $this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
}
@@ -185,7 +185,7 @@ public function test_wp_dropdown_languages_en_US_selected() {
$this->assertStringContainsString( 'id="foo"', $actual );
$this->assertStringContainsString( 'name="bar"', $actual );
- $this->assertStringContainsString( '', $actual );
+ $this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
@@ -214,7 +214,7 @@ public function test_wp_dropdown_languages_site_default_ja_JP() {
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
- $this->assertStringContainsString( '', $actual );
+ $this->assertStringContainsString( '', $actual );
}
/**
@@ -238,7 +238,7 @@ public function test_wp_dropdown_languages_ja_JP_selected() {
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
$this->assertStringContainsString( '', $actual );
- $this->assertStringContainsString( '', $actual );
+ $this->assertStringContainsString( '', $actual );
}
/**
diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php
index 5bfb675683..0335e45d0e 100644
--- a/tests/phpunit/tests/media.php
+++ b/tests/phpunit/tests/media.php
@@ -161,11 +161,7 @@ public function test_img_caption_shortcode_with_old_format() {
$this->assertSame( 1, substr_count( $result, 'alignnone' ) );
$this->assertSame( 1, substr_count( $result, self::CAPTION ) );
- if ( current_theme_supports( 'html5', 'caption' ) ) {
- $this->assertSame( 1, substr_count( $result, 'width: 20' ) );
- } else {
- $this->assertSame( 1, substr_count( $result, 'width: 30' ) );
- }
+ $this->assertSame( 1, substr_count( $result, 'width: 30' ) );
}
public function test_img_caption_shortcode_with_old_format_id_and_align() {
@@ -780,8 +776,8 @@ public function test_video_shortcode_body() {
$expected = '' .
"\n" .
- '