Ticket #45484: 45484.diff

src/wp-includes/class-wp-customize-manager.php

@@ -1523 +1523 @@
 
                 // Options.
                 foreach ( $options as $name => $value ) {
-                        if ( preg_match( '/^{{(?P<symbol>.+)}}$/', $value, $matches ) ) {
+
+                        // Serialize values for search.
+                        $value = maybe_serialize( $value );
+
+                        if ( preg_match( '/s:\d+:"{{(?P<symbol>.+)}}"/', $value, $matches ) ) {
                                 if ( isset( $posts[ $matches['symbol'] ] ) ) {
-                                        $value = $posts[ $matches['symbol'] ]['ID'];
+                                        $symbol_match = $posts[ $matches['symbol'] ]['ID'];
                                 } elseif ( isset( $attachment_ids[ $matches['symbol'] ] ) ) {
-                                        $value = $attachment_ids[ $matches['symbol'] ];
+                                        $symbol_match = $attachment_ids[ $matches['symbol'] ];
+                                }
+
+                                // If we have any symbol matches, update the values.
+                                if ( isset( $symbol_match ) ) {
+
+                                        // Replace found string matches with post ID ints.
+                                        $value = str_replace( $matches[0], "i:{$symbol_match}", $value );
                                 } else {
                                         continue;
                                 }
                         }
 
+                        // Unserialize values after checking for post symbols, so they can be properly referenced.
+                        $value = maybe_unserialize( $value );
+
                         if ( empty( $changeset_data[ $name ] ) || ! empty( $changeset_data[ $name ]['starter_content'] ) ) {
                                 $this->set_post_value( $name, $value );
                                 $this->pending_starter_content_settings_ids[] = $name;
@@ -1541 +1555 @@
 
                 // Theme mods.
                 foreach ( $theme_mods as $name => $value ) {
-                        if ( preg_match( '/^{{(?P<symbol>.+)}}$/', $value, $matches ) ) {
+
+                        // Serialize values for search.
+                        $value = maybe_serialize( $value );
+
+                        if ( preg_match( '/s:\d+:"{{(?P<symbol>.+)}}"/', $value, $matches ) ) {
                                 if ( isset( $posts[ $matches['symbol'] ] ) ) {
-                                        $value = $posts[ $matches['symbol'] ]['ID'];
+                                        $symbol_match = $posts[ $matches['symbol'] ]['ID'];
                                 } elseif ( isset( $attachment_ids[ $matches['symbol'] ] ) ) {
-                                        $value = $attachment_ids[ $matches['symbol'] ];
+                                        $symbol_match = $attachment_ids[ $matches['symbol'] ];
+                                }
+
+                                // If we have any symbol matches, update the values.
+                                if ( isset( $symbol_match ) ) {
+
+                                        // Replace found string matches with post ID ints.
+                                        $value = str_replace( $matches[0], "i:{$symbol_match}", $value );
                                 } else {
                                         continue;
                                 }
                         }
 
+                        // Unserialize values after checking for post symbols, so they can be properly referenced.
+                        $value = maybe_unserialize( $value );
+
                         // Handle header image as special case since setting has a legacy format.
                         if ( 'header_image' === $name ) {
                                 $name     = 'header_image_data';