Skip to content
Browse files

Fix for empty plugin strings, class include moved for timing.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent baec4b2 commit da4a0d988e6b507b1617bd09b71389ff481bdcad saxmatt committed Aug 10, 2004
Showing with 8 additions and 6 deletions.
  1. +8 −6 wp-settings.php
View
14 wp-settings.php
@@ -6,6 +6,10 @@
// Fix for IIS, which doesn't set REQUEST_URI
$_SERVER['REQUEST_URI'] = ( isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME'] . (( isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '')));
+if ( !(phpversion() >= '4.1') )
+ die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
+
+
// Change to E_ALL for development/debugging
error_reporting(E_ALL ^ E_NOTICE);
@@ -43,17 +47,15 @@
$tableoptiongroup_options = $wpdb->optiongroup_options;
$tablepostmeta = $wpdb->postmeta;
-if ( !(phpversion() >= '4.1') )
- die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
-
-
-require (ABSPATH . WPINC . '/classes.php');
require (ABSPATH . WPINC . '/functions.php');
timer_start();
require (ABSPATH . WPINC . '/functions-formatting.php');
+require (ABSPATH . WPINC . '/functions-user.php');
+require (ABSPATH . WPINC . '/classes.php');
require (ABSPATH . WPINC . '/template-functions.php');
require (ABSPATH . WPINC . '/links.php');
require (ABSPATH . WPINC . '/kses.php');
+
require_once (ABSPATH . WPINC . '/wp-l10n.php');
$wpdb->hide_errors();
@@ -83,7 +85,7 @@
if ( get_settings('active_plugins') ) {
$current_plugins = get_settings('active_plugins');
foreach ($current_plugins as $plugin) {
- if (file_exists(ABSPATH . 'wp-content/plugins/' . $plugin))
+ if ('' != $plugin && file_exists(ABSPATH . 'wp-content/plugins/' . $plugin))
include(ABSPATH . 'wp-content/plugins/' . $plugin);
}
}

0 comments on commit da4a0d9

Please sign in to comment.
Something went wrong with that request. Please try again.