Log in with username/password: lyceum/lyceum

Changeset 1064

Show
Ignore:
Timestamp:
08/17/07 00:12:42 (1 year ago)
Author:
jjb
Message:

Removed cruft generated from merge conflicts. No logic has changed (yet?).

Created a wordpress ticket: http://trac.wordpress.org/ticket/4764

#749, #750

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/lyceum/wp-admin/options.php

    r1063 r1064  
    180180    } 
    181181     
    182 //<<<<<<< .working 
    183182   $goback = remove_query_arg('updated' , $_SERVER['HTTP_REFERER']); 
    184183   if ( 0 != count($errors)) 
     
    186185   if($any_changed) 
    187186   $goback = add_query_arg('updated', 'true', $_SERVER['HTTP_REFERER']); 
    188 // ======= 
    189 //    $referred = remove_query_arg('updated' , wp_get_referer()); 
    190 //    $goback = add_query_arg('updated', 'true', wp_get_referer()); 
    191 // >>>>>>> .merge-right.r4890 
     187   $referred = remove_query_arg('updated' , wp_get_referer()); 
    192188   $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback); 
    193189   if (get_settings('home') != $old_home) 
Log in with username/password: lyceum/lyceum