WordPress.org
Get WordPress

Make WordPress Core

Changeset 4709


Ignore:
Timestamp:
01/09/2007 10:04:49 AM (19 years ago)
Author:
markjaquith
Message:

Reverting non-essential stuff for a mean-and-lean 2.0.7 release

Location:
branches/2.0
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0/wp-admin/post.php

    r4697 r4709  
    141141
    142142    $post = & get_post($post_id);
    143 
    144     if ( $post->post_status == 'static')
     143    if ( 'static' == $post->post_status )
    145144        check_admin_referer('delete-page_' . $post_id);
    146145    else
    … …  
    159158
    160159    $sendback = wp_get_referer();
    161     if ( $post->post_status == 'static' )
     160    if ( 'static' == $post->post_status )
    162161        $sendback = get_option('siteurl') . '/wp-admin/edit-pages.php';
    163162    elseif ( strstr($sendback, 'post.php') )

  • branches/2.0/wp-includes/functions.php

    r4684 r4709  
    22292229        $text = 'Gone';
    22302230
    2231 //      if ( substr(php_sapi_name(), 0, 3) == 'cgi' )
    2232             @header("HTTP/1.1 $header $text");
    2233 //      else
    2234 //          @header("Status: $header $text");
     2231    @header("HTTP/1.1 $header $text");
    22352232}
    22362233

  • branches/2.0/wp-settings.php

    r4696 r4709  
    7272require_once (ABSPATH . WPINC . '/wp-db.php');
    7373
    74 // $table_prefix will be deprecated in version 2.1
    75 $wpdb->prefix = $table_prefix;
    76 
    77 if ( preg_match('|[^a-z0-9_]|i', $wpdb->prefix) )
    78     die(__('<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'));
    79 
    8074// Table names
    81 $wpdb->posts          = $wpdb->prefix . 'posts';
    82 $wpdb->users          = $wpdb->prefix . 'users';
    83 $wpdb->categories     = $wpdb->prefix . 'categories';
    84 $wpdb->post2cat       = $wpdb->prefix . 'post2cat';
    85 $wpdb->comments       = $wpdb->prefix . 'comments';
    86 $wpdb->links          = $wpdb->prefix . 'links';
    87 $wpdb->linkcategories = $wpdb->prefix . 'linkcategories';
    88 $wpdb->options        = $wpdb->prefix . 'options';
    89 $wpdb->postmeta       = $wpdb->prefix . 'postmeta';
    90 $wpdb->usermeta       = $wpdb->prefix . 'usermeta';
     75$wpdb->posts            = $table_prefix . 'posts';
     76$wpdb->users            = $table_prefix . 'users';
     77$wpdb->categories       = $table_prefix . 'categories';
     78$wpdb->post2cat         = $table_prefix . 'post2cat';
     79$wpdb->comments         = $table_prefix . 'comments';
     80$wpdb->links            = $table_prefix . 'links';
     81$wpdb->linkcategories   = $table_prefix . 'linkcategories';
     82$wpdb->options          = $table_prefix . 'options';
     83$wpdb->postmeta         = $table_prefix . 'postmeta';
     84$wpdb->usermeta         = $table_prefix . 'usermeta';
     85
     86$wpdb->prefix           = $table_prefix;
    9187
    9288if ( defined('CUSTOM_USER_TABLE') )
Note: See TracChangeset for help on using the changeset viewer.