Changeset 52486 for branches/3.7/src/wp-admin/includes/upgrade.php

Timestamp:

01/06/2022 06:27:19 PM (5 years ago)

Author:

desrosj

Message:

Grouped backports to the 3.7 branch.

• Query: Improve sanitization within WP_Tax_Query.
• Upgrade/Install: Avoid using unserialize() unnecessarily.
• Formatting: Correctly encode ASCII characters in post slugs.

Merges [52454,52456-52457] to the 3.7 branch.
Props vortfu, dd32, ehtis, zieladam, whyisjake, xknown, peterwilsoncc, desrosj, iandunn.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-admin/includes/upgrade.php (modified) (1 diff)

branches/3.7/src/wp-admin/includes/upgrade.php

@@ -1039 +1039 @@
                 while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
                         foreach( $rows as $row ) {
-                                $value = $row->option_value;
-                                if ( !@unserialize( $value ) )
+                                $value = maybe_unserialize( $row->option_value );
+                                if ( $value === $row->option_value )
                                         $value = stripslashes( $value );
                                 if ( $value !== $row->option_value ) {