Changeset 19690

Timestamp:

01/05/2012 09:21:51 PM (14 years ago)

Author:

nacin

Message:

Update some old upgrade functions to use untrailingslashit().

File:

• trunk/wp-admin/includes/upgrade.php (modified) (2 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -1363 +1363 @@
 function get_alloptions_110() {
     global $wpdb;
-    if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
-        foreach ($options as $option) {
-            // "When trying to design a foolproof system,
-            //  never underestimate the ingenuity of the fools :)" -- Dougal
-            if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
-            if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
-            if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
-            $all_options->{$option->option_name} = stripslashes($option->option_value);
+    $all_options = new stdClass;
+    if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
+        foreach ( $options as $option ) {
+            if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
+                $option->option_value = untrailingslashit( $option->option_value );
+            $all_options->{$option->option_name} = stripslashes( $option->option_value );
         }
     }
@@ -1388 +1386 @@
     global $wpdb;
 
-    if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
-        return preg_replace( '|/+$|', '', WP_HOME );
-    }
-
-    if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
-        return preg_replace( '|/+$|', '', WP_SITEURL );
-    }
-
-    $option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting) );
+    if ( $setting == 'home' && defined( 'WP_HOME' ) )
+        return untrailingslashit( WP_HOME );
+
+    if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
+        return untrailingslashit( WP_SITEURL );
+
+    $option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
     if ( 'home' == $setting && '' == $option )
-        return __get_option('siteurl');
-
-    if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
-        $option = preg_replace('|/+$|', '', $option);
-
-    @ $kellogs = unserialize($option);
-    if ($kellogs !== false)
+        return __get_option( 'siteurl' );
+
+    if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
+        $option = untrailingslashit( $option );
+
+    @ $kellogs = unserialize( $option );
+    if ( $kellogs !== false )
         return $kellogs;
     else