diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-07-12 12:00:43 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-07-12 12:00:43 +0000 |
| commit | 4231c71afa5ab4a879b12901e4ea466819e3f1f9 (patch) | |
| tree | 4fc7ba519718a6d2c8a98c4ec206c92f9c878d8d /wp-inst/wp-settings.php | |
| parent | 4f3bce79bfb5851cef9e7bc655c91bb3093cc401 (diff) | |
| download | wordpress-mu-4231c71afa5ab4a879b12901e4ea466819e3f1f9.tar.gz wordpress-mu-4231c71afa5ab4a879b12901e4ea466819e3f1f9.tar.xz wordpress-mu-4231c71afa5ab4a879b12901e4ea466819e3f1f9.zip | |
Changes from Core.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@2 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-settings.php')
| -rw-r--r-- | wp-inst/wp-settings.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php index 2ac3d38..b246db3 100644 --- a/wp-inst/wp-settings.php +++ b/wp-inst/wp-settings.php @@ -123,7 +123,7 @@ require (ABSPATH . WPINC . '/default-filters.php'); require_once (ABSPATH . WPINC . '/wp-l10n.php'); $wpdb->hide_errors(); -if ( !update_user_cache() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) { +if ( !update_category_cache() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) { if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') ) $link = 'install.php'; else @@ -134,6 +134,7 @@ $wpdb->show_errors(); require (ABSPATH . WPINC . '/functions-formatting.php'); require (ABSPATH . WPINC . '/functions-post.php'); +require (ABSPATH . WPINC . '/capabilities.php'); require (ABSPATH . WPINC . '/classes.php'); require (ABSPATH . WPINC . '/template-functions-general.php'); require (ABSPATH . WPINC . '/template-functions-links.php'); @@ -214,6 +215,7 @@ register_shutdown_function('shutdown_action_hook'); $wp_query = new WP_Query(); $wp_rewrite = new WP_Rewrite(); $wp = new WP(); +$wp_roles = new WP_Roles(); // Everything is loaded and initialized. do_action('init'); |