[wp-cvs] wordpress/wp-includes functions.php,1.139,1.140

[Matthew Mullenweg]

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

Modified Files:
	functions.php 
Log Message:
Don't need the 1=1

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** functions.php	8 Aug 2004 16:47:22 -0000	1.139
--- functions.php	9 Aug 2004 07:54:23 -0000	1.140
***************
*** 323,327 ****
  			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);
! 		if (@ $value =  unserialize($option->option_value) ) return $value;
  		else $value = $option->option_value;
  			$all_options->{$option->option_name} = $value;
--- 323,328 ----
  			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);
! 		if (@ $value =  unserialize($option->option_value) )
! 			$all_options->{$option->option_name} = $value;
  		else $value = $option->option_value;
  			$all_options->{$option->option_name} = $value;
***************
*** 1510,1514 ****
  function update_category_cache() {
      global $cache_categories, $wpdb;
!     $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories WHERE 1=1");
      foreach ($dogs as $catt) {
          $cache_categories[$catt->cat_ID] = $catt;
--- 1511,1515 ----
  function update_category_cache() {
      global $cache_categories, $wpdb;
!     $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");
      foreach ($dogs as $catt) {
          $cache_categories[$catt->cat_ID] = $catt;