Changeset 2 for trunk

Show
Ignore:
Timestamp:
07/12/05 12:00:43 (3 years ago)
Author:
donncha
Message:

Changes from Core.

Files:

Legend:

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

    r1 r2  
    124124 
    125125$wpdb->hide_errors(); 
    126 if ( !update_user_cache() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) { 
     126if ( !update_category_cache() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) { 
    127127        if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') ) 
    128128                $link = 'install.php'; 
     
    135135require (ABSPATH . WPINC . '/functions-formatting.php'); 
    136136require (ABSPATH . WPINC . '/functions-post.php'); 
     137require (ABSPATH . WPINC . '/capabilities.php'); 
    137138require (ABSPATH . WPINC . '/classes.php'); 
    138139require (ABSPATH . WPINC . '/template-functions-general.php'); 
     
    215216$wp_rewrite = new WP_Rewrite(); 
    216217$wp = new WP(); 
     218$wp_roles = new WP_Roles(); 
    217219 
    218220// Everything is loaded and initialized.