Make WordPress Core

Changeset 10083


Ignore:
Timestamp:
12/06/2008 07:14:22 AM (16 years ago)
Author:
matt
Message:

Continuation to [10060] to have both get_ and update_ use same $check_global setting. Coding style updates.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/functions.php

    r10077 r10083  
    678678    $settings = get_user_option( 'user-settings', $user->ID, false );
    679679
    680     if ( isset($_COOKIE['wp-settings-'.$user->ID]) ) {
    681         $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-'.$user->ID] );
    682 
    683         if ( ! empty($cookie) && strpos($cookie, '=') ) {
     680    if ( isset( $_COOKIE['wp-settings-' . $user->ID] ) ) {
     681        $cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user->ID] );
     682
     683        if ( ! empty( $cookie ) && strpos( $cookie, '=' ) ) {
    684684            if ( $cookie == $settings )
    685685                return;
    686686
    687687            $last_time = (int) get_user_option( 'user-settings-time', $user->ID, false );
    688             $saved = isset($_COOKIE['wp-settings-time-'.$user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-'.$user->ID] ) : 0;
     688            $saved = isset( $_COOKIE['wp-settings-time-' . $user->ID]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user->ID] ) : 0;
    689689
    690690            if ( $saved > $last_time ) {
    691                 update_user_option( $user->ID, 'user-settings', $cookie, true );
    692                 update_user_option( $user->ID, 'user-settings-time', time() - 5, true );
     691                update_user_option( $user->ID, 'user-settings', $cookie, false );
     692                update_user_option( $user->ID, 'user-settings-time', time() - 5, false );
    693693                return;
    694694            }
     
    696696    }
    697697
    698     setcookie('wp-settings-'.$user->ID, $settings, time() + 31536000, SITECOOKIEPATH);
    699     setcookie('wp-settings-time-'.$user->ID, time(), time() + 31536000, SITECOOKIEPATH);
     698    setcookie( 'wp-settings-'.$user->ID, $settings, time() + 31536000, SITECOOKIEPATH );
     699    setcookie( 'wp-settings-time-'.$user->ID, time(), time() + 31536000, SITECOOKIEPATH );
    700700}
    701701
Note: See TracChangeset for help on using the changeset viewer.