Changeset 12771

Timestamp:

01/20/2010 01:14:05 AM (16 years ago)

Author:

wpmuguru

Message:

sync single and multisite cookie hash, remove extraneous code, See #11644

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/default-constants.php (modified) (1 diff)
• wp-includes/ms-load.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -688 +688 @@
 --The Team @ SITE_NAME')", $network_id ) );
     $wpdb->query( $wpdb->prepare( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, %d, 'first_post', 'Welcome to <a href=\"SITE_URL\">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' )", $network_id ) );
-    $weblog_title = stripslashes( $_POST[ 'weblog_title' ] );
+    //@todo - network admins should have a method of editing the network siteurl (used for cookie hash)
+    $wpdb->query( $wpdb->prepare( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, %d, 'siteurl', %s)", $network_id, get_option( 'siteurl' ) ) );
 
     $current_site->domain = $domain;

trunk/wp-includes/default-constants.php

@@ -135 +135 @@
              * @since 1.5
              */
-            if( !defined('COOKIEHASH') )
-                    define('COOKIEHASH', md5(get_option('siteurl')));
+            if ( !defined( 'COOKIEHASH' ) ) {
+                $siteurl = get_site_option( 'siteurl' );
+                if ( $siteurl )
+                    define( 'COOKIEHASH', md5( $siteurl ) );
+                else
+                    define( 'COOKIEHASH', '' );
+            }
 
             /**

trunk/wp-includes/ms-load.php

@@ -48 +48 @@
     if( $current_site->site_name == false )
         $current_site->site_name = ucfirst( $current_site->domain );
-
-    if ( ! defined('WP_INSTALLING') ) {
-        if ( !isset($cookiehash) )
-            $cookiehash = '';
-
-        /**
-         * Used to guarantee unique hash cookies
-         * @since 1.5
-         */
-        if ( !defined('COOKIEHASH') )
-                define( 'COOKIEHASH', $cookiehash );
-    }
 
     $wpdb->hide_errors();