Show
Ignore:
Timestamp:
10/30/07 16:49:38 (1 year ago)
Author:
donncha
Message:

Merge with WordPress? 2.3.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-settings.php

    r1134 r1139  
    4545                $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL']; 
    4646        } 
    47         else 
    48         { 
    49                 // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice) 
    50                 if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) 
     47        else { 
     48                // If root then simulate that no script-name was specified 
     49                if (empty($_SERVER['PATH_INFO'])) 
     50                        $_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/'; 
     51                elseif ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) 
     52                        // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice) 
    5153                        $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO']; 
    5254                else 
     
    102104timer_start(); 
    103105 
    104 // Add define('WP_DEBUG',true); to wp-config.php to enable display of notices during development. 
    105 if (defined('WP_DEBUG') and WP_DEBUG == true) { 
    106    error_reporting(E_ALL); 
    107 } else { 
    108    error_reporting(E_ALL ^ E_NOTICE); 
    109 
     106// Change to E_ALL for development/debugging 
     107error_reporting(E_ALL ^ E_NOTICE); 
    110108 
    111109// For an advanced caching plugin to use, static because you would only want one 
     
    128126require (ABSPATH . WPINC . '/functions.php'); 
    129127 
    130 require_wp_db(); 
     128if ( file_exists(ABSPATH . 'wp-content/db.php') ) 
     129        require_once (ABSPATH . 'wp-content/db.php'); 
     130else 
     131        require_once (ABSPATH . WPINC . '/wp-db.php'); 
     132 
    131133// $table_prefix is deprecated as of 2.1 
    132134$wpdb->prefix = $wpdb->base_prefix = $table_prefix; 
     
    178180else 
    179181        require_once (ABSPATH . WPINC . '/cache.php'); 
    180  
    181 // To disable persistant caching, add the below line to your wp-config.php file, uncommented of course. 
    182 // define('DISABLE_CACHE', true); 
    183182 
    184183wp_cache_init();