[wp-cvs] wordpress wp-settings.php,1.50,1.51

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9623

Modified Files:
	wp-settings.php 
Log Message:
Fix for empty plugin strings, class include moved for timing.

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** wp-settings.php	9 Aug 2004 07:17:54 -0000	1.50
--- wp-settings.php	10 Aug 2004 22:02:26 -0000	1.51
***************
*** 7,10 ****
--- 7,14 ----
  $_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);
***************
*** 44,58 ****
  $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 . '/template-functions.php');
  require (ABSPATH . WPINC . '/links.php');
  require (ABSPATH . WPINC . '/kses.php');
  require_once (ABSPATH . WPINC . '/wp-l10n.php');
  
--- 48,60 ----
  $tablepostmeta = $wpdb->postmeta;
  
  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');
  
***************
*** 84,88 ****
  	$current_plugins = get_settings('active_plugins');
  	foreach ($current_plugins as $plugin) {
! 		if (file_exists(ABSPATH . 'wp-content/plugins/' . $plugin))
  			include(ABSPATH . 'wp-content/plugins/' . $plugin);
  	}
--- 86,90 ----
  	$current_plugins = get_settings('active_plugins');
  	foreach ($current_plugins as $plugin) {
! 		if ('' != $plugin && file_exists(ABSPATH . 'wp-content/plugins/' . $plugin))
  			include(ABSPATH . 'wp-content/plugins/' . $plugin);
  	}