Changeset 2107 for trunk/wp-admin/options.php

Timestamp:

01/20/2005 04:56:24 AM (21 years ago)

Author:

rboren

Message:

wp_setcookie() and wp_clearcookie(). Set cookies for both siteurl and home if they are not the same. Update cookies whenever home or siteurl change.

File:

• trunk/wp-admin/options.php (modified) (4 diffs)

trunk/wp-admin/options.php

@@ -28 +28 @@
 
 case 'update':
-    $any_changed = 0;
+    $any_changed = 0;
     
     if (!$_POST['page_options']) {
@@ -40 +40 @@
 
     $options = $wpdb->get_results("SELECT $wpdb->options.option_id, option_name, option_type, option_value, option_admin_level FROM $wpdb->options WHERE option_name IN ($option_names)");
+
+        // Save for later.
+        $old_siteurl = get_settings('siteurl');
+        $old_home = get_settings('home');
 
 // HACK
@@ -57 +61 @@
                 }
                 if( in_array($option->option_name, $nonbools) && $new_val == '0' ) $new_val = 'closed';
-                if ($new_val !== $old_val)
+                if ($new_val !== $old_val) {
                     $result = $wpdb->query("UPDATE $wpdb->options SET option_value = '$new_val' WHERE option_name = '$option->option_name'");
+                                        $any_changed++;
+                                }
             }
         }
@@ -66 +72 @@
     
     if ($any_changed) {
-        $message = sprintf(__('%d setting(s) saved... '), $any_changed);
+            // If siteurl or home changed, reset cookies.
+            if ( get_settings('siteurl') != $old_siteurl || get_settings('home') != $old_home ) {
+                // Get currently logged in user and password.
+                get_currentuserinfo();
+                // Clear cookies for old paths.
+                wp_clearcookie();
+                // Set cookies for new paths.
+                wp_setcookie($user_login, $user_pass_md5, true, get_settings('home'), get_settings('siteurl'));
+            }
+
+            //$message = sprintf(__('%d setting(s) saved... '), $any_changed);
     }
     
-        //$referred = str_replace('?updated=true' , '', $_SERVER['HTTP_REFERER']);
         $referred = remove_query_arg('updated' , $_SERVER['HTTP_REFERER']);
-        //$goback = str_replace('?updated=true', '', $_SERVER['HTTP_REFERER']) . '?updated=true';
         $goback = add_query_arg('updated', 'true', $_SERVER['HTTP_REFERER']);
-    $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
+        $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
     header('Location: ' . $goback);
     break;