-
+
'menu-header', 'theme_location' => 'primary' ) ); ?>
diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index c5050b21d3..04a3f1abf2 100644
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -44,8 +44,8 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
// On some setups GD library does not provide imagerotate() - Ticket #11536
if ( isset( $args['methods'] ) &&
- in_array( 'rotate', $args['methods'] ) &&
- ! function_exists('imagerotate') ){
+ in_array( 'rotate', $args['methods'] ) &&
+ ! function_exists('imagerotate') ){
return false;
}
diff --git a/wp-includes/class-wp-post.php b/wp-includes/class-wp-post.php
index 1b05a738bc..9c040e3ed8 100644
--- a/wp-includes/class-wp-post.php
+++ b/wp-includes/class-wp-post.php
@@ -283,10 +283,10 @@ final class WP_Post {
return true;
if ( 'post_category' == $key )
- return true;
+ return true;
if ( 'tags_input' == $key )
- return true;
+ return true;
return metadata_exists( 'post', $this->ID, $key );
}
diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
index fd1f485b57..2017526f8b 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -423,7 +423,7 @@ class WP_Query {
* @since 3.2.0
* @var bool
*/
- public $thumbnails_cached = false;
+ public $thumbnails_cached = false;
/**
* Cached list of search stopwords.
diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 21beaf6bc0..bb3161ed50 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -1805,7 +1805,7 @@ class WP_Rewrite {
// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
- $this->use_verbose_page_rules = true;
+ $this->use_verbose_page_rules = true;
else
$this->use_verbose_page_rules = false;
}
diff --git a/wp-includes/class-wp-walker.php b/wp-includes/class-wp-walker.php
index b73ee0d6fb..12d2fd22ab 100644
--- a/wp-includes/class-wp-walker.php
+++ b/wp-includes/class-wp-walker.php
@@ -251,9 +251,9 @@ class Walker {
foreach ( $children_elements as $orphans )
foreach ( $orphans as $op )
$this->display_element( $op, $empty_array, 1, 0, $args, $output );
- }
+ }
- return $output;
+ return $output;
}
/**
diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 3172486de3..161e3a2347 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -410,16 +410,16 @@ class WP {
// We're showing a feed, so WP is indeed the only thing that last changed.
if ( ! empty( $this->query_vars['withcomments'] )
- || false !== strpos( $this->query_vars['feed'], 'comments-' )
- || ( empty( $this->query_vars['withoutcomments'] )
- && ( ! empty( $this->query_vars['p'] )
- || ! empty( $this->query_vars['name'] )
- || ! empty( $this->query_vars['page_id'] )
- || ! empty( $this->query_vars['pagename'] )
- || ! empty( $this->query_vars['attachment'] )
- || ! empty( $this->query_vars['attachment_id'] )
- )
- )
+ || false !== strpos( $this->query_vars['feed'], 'comments-' )
+ || ( empty( $this->query_vars['withoutcomments'] )
+ && ( ! empty( $this->query_vars['p'] )
+ || ! empty( $this->query_vars['name'] )
+ || ! empty( $this->query_vars['page_id'] )
+ || ! empty( $this->query_vars['pagename'] )
+ || ! empty( $this->query_vars['attachment'] )
+ || ! empty( $this->query_vars['attachment_id'] )
+ )
+ )
) {
$wp_last_modified = mysql2date( 'D, d M Y H:i:s', get_lastcommentmodified( 'GMT' ), false );
} else {
@@ -449,8 +449,8 @@ class WP {
$wp_modified_timestamp = strtotime($wp_last_modified);
if ( ($client_last_modified && $client_etag) ?
- (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
- (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
+ (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
+ (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
$status = 304;
$exit_required = true;
}
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index e2bdaf60ce..fe21169796 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -2219,20 +2219,20 @@ function comment_form( $args = array(), $post_id = null ) {
'comment_field' => '',
/** This filter is documented in wp-includes/link-template.php */
'must_log_in' => '
' . sprintf(
- /* translators: %s: login URL */
- __( 'You must be logged in to post a comment.' ),
- wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
- ) . '
',
+ /* translators: %s: login URL */
+ __( 'You must be
logged in to post a comment.' ),
+ wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+ ) . '',
/** This filter is documented in wp-includes/link-template.php */
'logged_in_as' => '
' . sprintf(
- /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
- __( 'Logged in as %3$s. Log out?' ),
- get_edit_user_link(),
- /* translators: %s: user name */
- esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
- $user_identity,
- wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
- ) . '
',
+ /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+ __( '
Logged in as %3$s.
Log out?' ),
+ get_edit_user_link(),
+ /* translators: %s: user name */
+ esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+ $user_identity,
+ wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+ ) . '',
'comment_notes_before' => '',
'comment_notes_after' => '',
'action' => site_url( '/wp-comments-post.php' ),
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 07fed8100e..7c7a829035 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -1209,15 +1209,14 @@ function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_age
$word = preg_quote($word, '#');
$pattern = "#$word#i";
- if (
- preg_match($pattern, $author)
+ if ( preg_match($pattern, $author)
|| preg_match($pattern, $email)
|| preg_match($pattern, $url)
|| preg_match($pattern, $comment)
|| preg_match($pattern, $comment_without_html)
|| preg_match($pattern, $user_ip)
|| preg_match($pattern, $user_agent)
- )
+ )
return true;
}
return false;
diff --git a/wp-includes/compat.php b/wp-includes/compat.php
index 7e37c30762..af76006303 100644
--- a/wp-includes/compat.php
+++ b/wp-includes/compat.php
@@ -472,9 +472,9 @@ if ( ! function_exists( 'array_replace_recursive' ) ) :
foreach ( array_keys( $head ) as $key ) {
if ( isset( $key, $bref ) &&
- isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
- isset( $head[ $key ] ) && is_array( $head[ $key ] )
- ) {
+ isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
+ isset( $head[ $key ] ) && is_array( $head[ $key ] ) ) {
+
$bref_stack[] = &$bref[ $key ];
$head_stack[] = $head[ $key ];
} else {
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index 2c93aba536..09296b4278 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -14,19 +14,19 @@ echo '';
do_action( 'rss_tag_pre', 'atom' );
?>
- >
+ xmlns="http://www.w3.org/2005/Atom"
+ xmlns:thr="http://purl.org/syndication/thread/1.0"
+ xml:lang=""
+ xml:base="/wp-atom.php"
+
+>
<?php wp_title_rss(); ?>
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 067249a510..1dfaff9f26 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -618,7 +618,7 @@ function get_html_split_regex() {
if ( ! isset( $regex ) ) {
$comments =
- '!' // Start of comment, after the <.
+ '!' // Start of comment, after the <.
. '(?:' // Unroll the loop: Consume everything until --> is found.
. '-(?!->)' // Dash not followed by end of comment.
. '[^\-]*+' // Consume non-dashes.
@@ -626,7 +626,7 @@ function get_html_split_regex() {
. '(?:-->)?'; // End of comment. If not found, match all input.
$cdata =
- '!\[CDATA\[' // Start of comment, after the <.
+ '!\[CDATA\[' // Start of comment, after the <.
. '[^\]]*+' // Consume non-].
. '(?:' // Unroll the loop: Consume everything until ]]> is found.
. '](?!]>)' // One ] not followed by end of comment.
@@ -635,7 +635,7 @@ function get_html_split_regex() {
. '(?:]]>)?'; // End of comment. If not found, match all input.
$escaped =
- '(?=' // Is the element escaped?
+ '(?=' // Is the element escaped?
. '!--'
. '|'
. '!\[CDATA\['
@@ -647,7 +647,7 @@ function get_html_split_regex() {
. ')';
$regex =
- '/(' // Capture the entire match.
+ '/(' // Capture the entire match.
. '<' // Find start of element.
. '(?' // Conditional expression follows.
. $escaped // Find end of escaped element.
@@ -678,7 +678,7 @@ function _get_wptexturize_split_regex( $shortcode_regex = '' ) {
if ( ! isset( $html_regex ) ) {
$comment_regex =
- '!' // Start of comment, after the <.
+ '!' // Start of comment, after the <.
. '(?:' // Unroll the loop: Consume everything until --> is found.
. '-(?!->)' // Dash not followed by end of comment.
. '[^\-]*+' // Consume non-dashes.
@@ -686,7 +686,7 @@ function _get_wptexturize_split_regex( $shortcode_regex = '' ) {
. '(?:-->)?'; // End of comment. If not found, match all input.
$html_regex = // Needs replaced with wp_html_split() per Shortcode API Roadmap.
- '<' // Find start of element.
+ '<' // Find start of element.
. '(?(?=!--)' // Is this a comment?
. $comment_regex // Find end of comment.
. '|'
@@ -718,7 +718,7 @@ function _get_wptexturize_shortcode_regex( $tagnames ) {
$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
$tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().
$regex =
- '\[' // Find start of shortcode.
+ '\[' // Find start of shortcode.
. '[\/\[]?' // Shortcodes may begin with [/ or [[
. $tagregexp // Only match registered shortcodes, because performance.
. '(?:'
@@ -818,7 +818,7 @@ function shortcode_unautop( $pee ) {
$spaces = wp_spaces_regexp();
$pattern =
- '/'
+ '/'
. '' // Opening paragraph
. '(?:' . $spaces . ')*+' // Optional leading whitespace
. '(' // 1: The shortcode
@@ -2751,8 +2751,8 @@ function wp_rel_nofollow_callback( $matches ) {
$rel = 'nofollow';
if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
- preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
- ) {
+ preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text ) ) {
+
return "";
}
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index aa19436a69..5a2d3c5d4e 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -3383,48 +3383,48 @@ function smilies_init() {
':mrgreen:' => 'mrgreen.png',
':neutral:' => "\xf0\x9f\x98\x90",
':twisted:' => "\xf0\x9f\x98\x88",
- ':arrow:' => "\xe2\x9e\xa1",
- ':shock:' => "\xf0\x9f\x98\xaf",
- ':smile:' => "\xf0\x9f\x99\x82",
- ':???:' => "\xf0\x9f\x98\x95",
- ':cool:' => "\xf0\x9f\x98\x8e",
- ':evil:' => "\xf0\x9f\x91\xbf",
- ':grin:' => "\xf0\x9f\x98\x80",
- ':idea:' => "\xf0\x9f\x92\xa1",
- ':oops:' => "\xf0\x9f\x98\xb3",
- ':razz:' => "\xf0\x9f\x98\x9b",
- ':roll:' => "\xf0\x9f\x99\x84",
- ':wink:' => "\xf0\x9f\x98\x89",
- ':cry:' => "\xf0\x9f\x98\xa5",
- ':eek:' => "\xf0\x9f\x98\xae",
- ':lol:' => "\xf0\x9f\x98\x86",
- ':mad:' => "\xf0\x9f\x98\xa1",
- ':sad:' => "\xf0\x9f\x99\x81",
- '8-)' => "\xf0\x9f\x98\x8e",
- '8-O' => "\xf0\x9f\x98\xaf",
- ':-(' => "\xf0\x9f\x99\x81",
- ':-)' => "\xf0\x9f\x99\x82",
- ':-?' => "\xf0\x9f\x98\x95",
- ':-D' => "\xf0\x9f\x98\x80",
- ':-P' => "\xf0\x9f\x98\x9b",
- ':-o' => "\xf0\x9f\x98\xae",
- ':-x' => "\xf0\x9f\x98\xa1",
- ':-|' => "\xf0\x9f\x98\x90",
- ';-)' => "\xf0\x9f\x98\x89",
+ ':arrow:' => "\xe2\x9e\xa1",
+ ':shock:' => "\xf0\x9f\x98\xaf",
+ ':smile:' => "\xf0\x9f\x99\x82",
+ ':???:' => "\xf0\x9f\x98\x95",
+ ':cool:' => "\xf0\x9f\x98\x8e",
+ ':evil:' => "\xf0\x9f\x91\xbf",
+ ':grin:' => "\xf0\x9f\x98\x80",
+ ':idea:' => "\xf0\x9f\x92\xa1",
+ ':oops:' => "\xf0\x9f\x98\xb3",
+ ':razz:' => "\xf0\x9f\x98\x9b",
+ ':roll:' => "\xf0\x9f\x99\x84",
+ ':wink:' => "\xf0\x9f\x98\x89",
+ ':cry:' => "\xf0\x9f\x98\xa5",
+ ':eek:' => "\xf0\x9f\x98\xae",
+ ':lol:' => "\xf0\x9f\x98\x86",
+ ':mad:' => "\xf0\x9f\x98\xa1",
+ ':sad:' => "\xf0\x9f\x99\x81",
+ '8-)' => "\xf0\x9f\x98\x8e",
+ '8-O' => "\xf0\x9f\x98\xaf",
+ ':-(' => "\xf0\x9f\x99\x81",
+ ':-)' => "\xf0\x9f\x99\x82",
+ ':-?' => "\xf0\x9f\x98\x95",
+ ':-D' => "\xf0\x9f\x98\x80",
+ ':-P' => "\xf0\x9f\x98\x9b",
+ ':-o' => "\xf0\x9f\x98\xae",
+ ':-x' => "\xf0\x9f\x98\xa1",
+ ':-|' => "\xf0\x9f\x98\x90",
+ ';-)' => "\xf0\x9f\x98\x89",
// This one transformation breaks regular text with frequency.
// '8)' => "\xf0\x9f\x98\x8e",
- '8O' => "\xf0\x9f\x98\xaf",
- ':(' => "\xf0\x9f\x99\x81",
- ':)' => "\xf0\x9f\x99\x82",
- ':?' => "\xf0\x9f\x98\x95",
- ':D' => "\xf0\x9f\x98\x80",
- ':P' => "\xf0\x9f\x98\x9b",
- ':o' => "\xf0\x9f\x98\xae",
- ':x' => "\xf0\x9f\x98\xa1",
- ':|' => "\xf0\x9f\x98\x90",
- ';)' => "\xf0\x9f\x98\x89",
- ':!:' => "\xe2\x9d\x97",
- ':?:' => "\xe2\x9d\x93",
+ '8O' => "\xf0\x9f\x98\xaf",
+ ':(' => "\xf0\x9f\x99\x81",
+ ':)' => "\xf0\x9f\x99\x82",
+ ':?' => "\xf0\x9f\x98\x95",
+ ':D' => "\xf0\x9f\x98\x80",
+ ':P' => "\xf0\x9f\x98\x9b",
+ ':o' => "\xf0\x9f\x98\xae",
+ ':x' => "\xf0\x9f\x98\xa1",
+ ':|' => "\xf0\x9f\x98\x90",
+ ';)' => "\xf0\x9f\x98\x89",
+ ':!:' => "\xe2\x9d\x97",
+ ':?:' => "\xe2\x9d\x93",
);
}
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index e694e2cb30..55db605882 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2948,8 +2948,8 @@ function wp_resource_hints() {
foreach ( $atts as $attr => $value ) {
if ( ! is_scalar( $value ) ||
- ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ))
- ) {
+ ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr )) ) {
+
continue;
}
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index c95b0179f2..8a595903ea 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -1094,7 +1094,7 @@ function wp_kses_hair_parse( $attr ) {
}
$regex =
- '(?:'
+ '(?:'
. '[-a-zA-Z:]+' // Attribute name.
. '|'
. '\[\[?[^\[\]]+\]\]?' // Shortcode in the name position implies unfiltered_html.
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index eb22284ca3..50aff6089f 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -1990,7 +1990,7 @@ function get_next_post_link( $format = '%link »', $link = '%title', $in_sa
* @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'.
*/
function next_post_link( $format = '%link »', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
- echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+ echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
}
/**
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 1981f3ad9a..fa84b39d1b 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -2973,7 +2973,8 @@ function _wp_image_editor_choose( $args = array() ) {
}
if ( isset( $args['methods'] ) &&
- array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
+ array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
+
continue;
}
@@ -3500,9 +3501,10 @@ function wp_enqueue_media( $args = array() ) {
'replace' => __( 'Replace' ),
'remove' => __( 'Remove' ),
'back' => __( 'Back' ),
- /* translators: This is a would-be plural string used in the media manager.
- If there is not a word you can use in your language to avoid issues with the
- lack of plural support here, turn it into "selected: %d" then translate it.
+ /*
+ * translators: This is a would-be plural string used in the media manager.
+ * If there is not a word you can use in your language to avoid issues with the
+ * lack of plural support here, turn it into "selected: %d" then translate it.
*/
'selected' => __( '%d selected' ),
'dragInfo' => __( 'Drag and drop to reorder media files.' ),
diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 6a290bdaa9..00c97f0f93 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -511,7 +511,7 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
// Associate the menu item with the menu term
// Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()
- if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
+ if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
}
diff --git a/wp-includes/option.php b/wp-includes/option.php
index 719fd715ff..4576e8f66b 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -103,7 +103,7 @@ function get_option( $option, $default = false ) {
wp_cache_add( $option, $value, 'options' );
} else { // option does not exist, so we must cache its non-existence
if ( ! is_array( $notoptions ) ) {
- $notoptions = array();
+ $notoptions = array();
}
$notoptions[$option] = true;
wp_cache_set( 'notoptions', $notoptions, 'options' );
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 1dab926aea..2af241b6c5 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -3630,14 +3630,14 @@ function wp_update_post( $postarr = array(), $wp_error = false ) {
// Passed post category list overwrites existing category list if not empty.
if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
- && 0 != count($postarr['post_category']) )
+ && 0 != count($postarr['post_category']) )
$post_cats = $postarr['post_category'];
else
$post_cats = $post['post_category'];
// Drafts shouldn't be assigned a date unless explicitly done so by the user.
if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
- ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
+ ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
$clear_date = true;
else
$clear_date = false;
diff --git a/wp-includes/revision.php b/wp-includes/revision.php
index c166fbf131..136395e2f1 100644
--- a/wp-includes/revision.php
+++ b/wp-includes/revision.php
@@ -596,12 +596,12 @@ function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
}
if ( empty( $_REQUEST['_thumbnail_id'] ) ||
- empty( $_REQUEST['preview_id'] ) ||
- $post->ID != $post_id ||
- '_thumbnail_id' != $meta_key ||
- 'revision' == $post->post_type ||
- $post_id != $_REQUEST['preview_id']
- ) {
+ empty( $_REQUEST['preview_id'] ) ||
+ $post->ID != $post_id ||
+ '_thumbnail_id' != $meta_key ||
+ 'revision' == $post->post_type ||
+ $post_id != $_REQUEST['preview_id'] ) {
+
return $value;
}
diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index c6df28b3dc..596e6c0eb7 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -236,7 +236,7 @@ function get_shortcode_regex( $tagnames = null ) {
// WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
// Also, see shortcode_unautop() and shortcode.js.
return
- '\\[' // Opening bracket
+ '\\[' // Opening bracket
. '(\\[?)' // 1: Optional second opening bracket for escaping shortcodes: [[tag]]
. "($tagregexp)" // 2: Shortcode name
. '(?![\\w-])' // Not followed by word character or hyphen
diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php
index f7e0b30f2b..cb6d64fd9b 100644
--- a/wp-includes/theme-compat/comments.php
+++ b/wp-includes/theme-compat/comments.php
@@ -56,12 +56,12 @@ _deprecated_file(