[wp-cvs] wordpress/wp-includes functions-formatting.php, 1.30.4.1, 1.30.4.2 functions.php, 1.101.4.2, 1.101.4.3 links.php, 1.12.4.1, 1.12.4.2 version.php, 1.15.4.1, 1.15.4.2

[Mike Little]

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

Modified Files:
      Tag: WordPress-Ver-1_2-Branch
	functions-formatting.php functions.php links.php version.php 
Log Message:
Reverted dubious commits on 1.2 branch

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.101.4.2
retrieving revision 1.101.4.3
diff -C2 -d -r1.101.4.2 -r1.101.4.3
*** functions.php	2 Oct 2004 00:47:42 -0000	1.101.4.2
--- functions.php	5 Oct 2004 22:39:07 -0000	1.101.4.3
***************
*** 21,26 ****
  }
  
! // patch by Adriaan Tijsseling (http://kung-foo.tv): added an option to return the UTC string
! function mysql2date($dateformatstring, $mysqlstring, $use_b2configmonthsdays = 1, $utc=0) {
  	global $month, $weekday;
  	$m = $mysqlstring;
--- 21,25 ----
  }
  
! function mysql2date($dateformatstring, $mysqlstring, $use_b2configmonthsdays = 1) {
  	global $month, $weekday;
  	$m = $mysqlstring;
***************
*** 29,36 ****
  	}
  	$i = mktime(substr($m,11,2),substr($m,14,2),substr($m,17,2),substr($m,5,2),substr($m,8,2),substr($m,0,4)); 
- 	if ( $utc )
- 	{
-         $i -= get_settings('gmt_offset') * 3600;
- 	}
  	if (!empty($month) && !empty($weekday) && $use_b2configmonthsdays) {
  		$datemonth = $month[date('m', $i)];
--- 28,31 ----
***************
*** 48,53 ****
  	//	echo $i." ".$mysqlstring;
  	}
- 	if ( $utc )
- 	   return $j . 'Z';
  	return $j;
  }
--- 43,46 ----
***************
*** 1351,1361 ****
  	$words = explode("\n", get_settings('moderation_keys') );
  	foreach ($words as $word) {
! 		$word = trim($word);
! 
! 		// Skip empty lines.
! 		if (empty($word)) { continue; }
! 
! 		$pattern = "#$word#i";
! 
  		if ( preg_match($pattern, $author) ) return false;
  		if ( preg_match($pattern, $email) ) return false;
--- 1344,1349 ----
  	$words = explode("\n", get_settings('moderation_keys') );
  	foreach ($words as $word) {
! 	$word = trim($word);
! 	$pattern = "#$word#i";
  		if ( preg_match($pattern, $author) ) return false;
  		if ( preg_match($pattern, $email) ) return false;
***************
*** 1372,1382 ****
  }
  
! // Borrowed from the PHP Manual user notes. Convert entities, while
! // preserving already-encoded entities:
! function htmlentities2($myHTML) {
! 	$translation_table=get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
! 	$translation_table[chr(38)] = '&';
! 	return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&" , strtr($myHTML, $translation_table));
! }
! 
! ?>
--- 1360,1362 ----
  }
  
! ?>
\ No newline at end of file

Index: functions-formatting.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-formatting.php,v
retrieving revision 1.30.4.1
retrieving revision 1.30.4.2
diff -C2 -d -r1.30.4.1 -r1.30.4.2
*** functions-formatting.php	29 Sep 2004 13:32:47 -0000	1.30.4.1
--- functions-formatting.php	5 Oct 2004 22:39:07 -0000	1.30.4.2
***************
*** 35,39 ****
  			$curl = preg_replace("/\(r\)/i", '®', $curl);
  			$curl = str_replace("''", '”', $curl);
! 
  			$curl = preg_replace('/(d+)x(\d+)/', "$1×$2", $curl);
  
--- 35,39 ----
  			$curl = preg_replace("/\(r\)/i", '®', $curl);
  			$curl = str_replace("''", '”', $curl);
! 			
  			$curl = preg_replace('/(d+)x(\d+)/', "$1×$2", $curl);
  
***************
*** 41,45 ****
  			// strstr is fast
  			$next = false;
! 		} elseif (strstr($curl, '</code') || strstr($curl, '</pre') || strstr($curl, '</kbd' || strstr($curl, '</style') || strstr($curl, '</script'))) {
  			$next = true;
  		}
--- 41,45 ----
  			// strstr is fast
  			$next = false;
! 		} else {
  			$next = true;
  		}

Index: links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/links.php,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -C2 -d -r1.12.4.1 -r1.12.4.2
*** links.php	29 Sep 2004 13:29:57 -0000	1.12.4.1
--- links.php	5 Oct 2004 22:39:07 -0000	1.12.4.2
***************
*** 541,549 ****
  
  	if (!isset($direction)) $direction = '';
! 	// Fetch the link category data as an array of hashes
  	$cats = $wpdb->get_results("
  		SELECT DISTINCT link_category, cat_name, show_images, 
  			show_description, show_rating, show_updated, sort_order, 
! 			sort_desc, list_limit, text_before_link, text_after_link, text_after_all
  		FROM `$tablelinks` 
  		LEFT JOIN `$tablelinkcategories` ON (link_category = cat_id)
--- 541,549 ----
  
  	if (!isset($direction)) $direction = '';
! 	// Fetch the link category data as an array of hashesa
  	$cats = $wpdb->get_results("
  		SELECT DISTINCT link_category, cat_name, show_images, 
  			show_description, show_rating, show_updated, sort_order, 
! 			sort_desc, list_limit
  		FROM `$tablelinks` 
  		LEFT JOIN `$tablelinkcategories` ON (link_category = cat_id)
***************
*** 564,570 ****
  			// Call get_links() with all the appropriate params
  			get_links($cat['link_category'],
! 				$cat['text_before_link'],
! 				$cat['text_after_all'],
! 				$cat['text_after_link'],
  				bool_from_yn($cat['show_images']),
  				$orderby,
--- 564,568 ----
  			// Call get_links() with all the appropriate params
  			get_links($cat['link_category'],
! 				'<li>',"</li>","\n",
  				bool_from_yn($cat['show_images']),
  				$orderby,
***************
*** 580,582 ****
  }
  
! ?>
--- 578,580 ----
  }
  
! ?>
\ No newline at end of file

Index: version.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/version.php,v
retrieving revision 1.15.4.1
retrieving revision 1.15.4.2
diff -C2 -d -r1.15.4.1 -r1.15.4.2
*** version.php	27 May 2004 22:18:29 -0000	1.15.4.1
--- version.php	5 Oct 2004 22:39:07 -0000	1.15.4.2
***************
*** 3,7 ****
  // This just holds the version number, in a separate file so we can bump it without cluttering the CVS
  
! $wp_version = '1.2.1-cvs';
  
  ?>
\ No newline at end of file
--- 3,7 ----
  // This just holds the version number, in a separate file so we can bump it without cluttering the CVS
  
! $wp_version = '1.2';
  
  ?>
\ No newline at end of file