Changeset 24449 for branches/3.5

Timestamp:

06/19/2013 10:12:36 PM (12 years ago)

Author:

nacin

Message:

Fix storage of illegal_names. Add an upgrade routine to fix bad values.

Merges [24448] to the 3.5 branch. Bump DB version by one.

props SergeyBiryukov.
fixes #23418.

Location:

branches/3.5

Files:

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

branches/3.5/wp-admin/includes/upgrade.php

@@ -1278 +1278 @@
     if ( $wp_current_db_version < 21823 )
         update_site_option( 'ms_files_rewriting', '1' );
+
+    // 3.5.2
+    if ( $wp_current_db_version < 22442 ) {
+        $illegal_names = get_site_option( 'illegal_names' );
+        if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
+            $illegal_name = reset( $illegal_names );
+            $illegal_names = explode( ' ', $illegal_name );
+            update_site_option( 'illegal_names', $illegal_names );
+        }
+    }
 }
 

branches/3.5/wp-includes/formatting.php

@@ -2871 +2871 @@
         case 'illegal_names':
             if ( ! is_array( $value ) )
-                $value = explode( "\n", $value );
+                $value = explode( ' ', $value );
 
             $value = array_values( array_filter( array_map( 'trim', $value ) ) );

branches/3.5/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 22441;
+$wp_db_version = 22442;
 
 /**