Changeset 4175

Timestamp:

09/08/2006 09:42:05 PM (18 years ago)

Author:

ryan

Message:

Move home and siteurl update events to action hooks.

Location:

trunk/wp-admin

Files:

• admin-functions.php (modified) (1 diff)
• options.php (modified) (2 diffs)

trunk/wp-admin/admin-functions.php

@@ -2065 +2065 @@
 }
 
+// If siteurl or home changed, reset cookies and flush rewrite rules.
+function update_home_siteurl($old_value, $value) {
+    global $wp_rewrite, $user_login, $user_pass_md5;
+    // If home changed, write rewrite rules to new location.
+    $wp_rewrite->flush_rules();
+    // Clear cookies for old paths.
+    wp_clearcookie();
+    // Set cookies for new paths.
+    wp_setcookie($user_login, $user_pass_md5, true, get_option('home'), get_option('siteurl')); 
+}
+
+add_action('update_option_home', 'update_home_siteurl');
+add_action('update_option_siteurl', 'update_home_siteurl');
+
 ?>

trunk/wp-admin/options.php

@@ -87 +87 @@
     }
 
-    // Save for later.
-    $old_siteurl = get_option('siteurl');
-    $old_home = get_option('home');
-
     if ($options) {
         foreach ($options as $option) {
@@ -96 +92 @@
             $value = trim(stripslashes($_POST[$option]));
             $value = sanitize_option($option, $value);
-
-            if (update_option($option, $value) ) {
-                $any_changed++;
-            }
+            update_option($option, $value);
         }
     }
-    
-    if ($any_changed) {
-            // If siteurl or home changed, reset cookies.
-            if ( get_option('siteurl') != $old_siteurl || get_option('home') != $old_home ) {
-                // If home changed, write rewrite rules to new location.
-                $wp_rewrite->flush_rules();
-                // Clear cookies for old paths.
-                wp_clearcookie();
-                // Set cookies for new paths.
-                wp_setcookie($user_login, $user_pass_md5, true, get_option('home'), get_option('siteurl'));
-            }
-
-            //$message = sprintf(__('%d setting(s) saved... '), $any_changed);
-    }
     
     $referred = remove_query_arg('updated' , wp_get_referer());