[wp-cvs] wordpress/wp-includes functions.php,1.115,1.116

[Matthew Mullenweg]

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

Modified Files:
	functions.php 
Log Message:
Changes to options system and query improvements.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** functions.php	8 Jun 2004 09:34:01 -0000	1.115
--- functions.php	10 Jun 2004 08:42:25 -0000	1.116
***************
*** 189,193 ****
  function get_userdatabylogin($user_login) {
  	global $cache_userdata, $wpdb;
! 	if ( empty($cache_userdata["$user_login"]) ) {
  		$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'");
  		$cache_userdata["$user_login"] = $user;
--- 189,193 ----
  function get_userdatabylogin($user_login) {
  	global $cache_userdata, $wpdb;
! 	if ( !empty($user_login) && empty($cache_userdata["$user_login"]) ) {
  		$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'");
  		$cache_userdata["$user_login"] = $user;
***************
*** 200,204 ****
  function get_userid($user_login) {
  	global $cache_userdata, $wpdb;
! 	if ( empty($cache_userdata["$user_login"]) ) {
  		$user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$user_login'");
  
--- 200,204 ----
  function get_userid($user_login) {
  	global $cache_userdata, $wpdb;
! 	if ( !empty($user_login) && empty($cache_userdata["$user_login"]) ) {
  		$user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$user_login'");
  
***************
*** 301,321 ****
  function get_settings($setting) {
  	global $wpdb, $cache_settings;
! 	if (strstr($_SERVER['REQUEST_URI'], 'install.php')) {
  		return false;
  	}
  
! 	if ( (empty($cache_settings)) ) {
! 		$settings = get_alloptions();
! 		$cache_settings = $settings;
! 	} else {
! 		$settings = $cache_settings;
  	}
  
! 	if ('home' == $setting && '' == $settings->home) return $settings->siteurl;
  
! 	if (!isset($settings->$setting)) {
! 		return false;
  	} else {
! 		return stripslashes($settings->$setting);
  	}
  }
--- 301,318 ----
  function get_settings($setting) {
  	global $wpdb, $cache_settings;
! 	if ( strstr($_SERVER['REQUEST_URI'], 'install.php') || strstr($_SERVER['REQUEST_URI'], 'upgrade.php') ) {
  		return false;
  	}
  
! 	if ( empty($cache_settings) ) {
! 		$cache_settings = get_alloptions();
  	}
  
! 	if ('home' == $setting && '' == $cache_settings->home) return $cache_settings->siteurl;
  
! 	if (!isset($cache_settings->$setting)) {
! 		return $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
  	} else {
! 		return $cache_settings->$setting;
  	}
  }
***************
*** 323,336 ****
  function get_alloptions() {
  	global $wpdb;
! 	$options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
! 	if ($options) {
  		foreach ($options as $option) {
  			// "When trying to design a foolproof system, 
! 			//  never underestimate the ingenuity of the fools :)"
  			if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  			if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  			if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  
! 			$all_options->{$option->option_name} = $option->option_value;
  		}
  	}
--- 320,332 ----
  function get_alloptions() {
  	global $wpdb;
! 	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'")) {
  		foreach ($options as $option) {
  			// "When trying to design a foolproof system, 
! 			//  never underestimate the ingenuity of the fools :)" -- Dougal
  			if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  			if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  			if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  
! 			$all_options->{$option->option_name} = stripslashes($option->option_value);
  		}
  	}
***************
*** 1812,1819 ****
      global $cache_userdata, $wpdb;
  
!     $users = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE user_level > 0");
!     foreach ($users as $user) {
!         $cache_userdata[$user->ID] = $user;
!     }
  }
  
--- 1808,1819 ----
      global $cache_userdata, $wpdb;
  
!     if ( $users = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE user_level > 0") ) :
! 		foreach ($users as $user) :
! 			$cache_userdata[$user->ID] = $user;
! 		endforeach;
! 		return true;
! 	else: 
! 		return false;
! 	endif;
  }