[wp-cvs] wordpress wp-login.php, 1.34, 1.35 wp-settings.php, 1.55, 1.56 wp-trackback.php, 1.22, 1.23

[Matthew Mullenweg]

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

Modified Files:
	wp-login.php wp-settings.php wp-trackback.php 
Log Message:
Code cleanup and some fixes from the WP Japan folks.

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** wp-settings.php	26 Sep 2004 18:12:55 -0000	1.55
--- wp-settings.php	4 Oct 2004 08:03:52 -0000	1.56
***************
*** 10,13 ****
--- 10,21 ----
  	die( 'Your server is running PHP version ' . phpversion() . ' but WordPress requires at least 4.1' );
  
+ function timer_start() {
+ 	global $timestart;
+ 	$mtime = explode(' ', microtime() );
+ 	$mtime = $mtime[1] + $mtime[0];
+ 	$timestart = $mtime;
+ 	return true;
+ }
+ timer_start();
  
  // Change to E_ALL for development/debugging
***************
*** 41,45 ****
  
  require (ABSPATH . WPINC . '/functions.php');
- timer_start();
  require (ABSPATH . WPINC . '/functions-formatting.php');
  require (ABSPATH . WPINC . '/functions-user.php');
--- 49,52 ----

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wp-login.php	4 Oct 2004 07:44:04 -0000	1.34
--- wp-login.php	4 Oct 2004 08:03:51 -0000	1.35
***************
*** 2,36 ****
  require('./wp-config.php');
  
- function login($username, $password, $already_md5 = false) {
- 	global $wpdb, $error;
- 	if ( !$already_md5 )
- 		$pwd = md5($password);
- 
- 	if ( !$username )
- 		return false;
- 
- 	if ( !$password ) {
- 		$error = __('<strong>Error</strong>: The password field is empty.');
- 		return false;
- 	}
- 
- 	$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
- 
- 	if (!$login) {
- 		$error = __('<strong>Error</strong>: Wrong login.');
- 		$pwd = '';
- 		return false;
- 	} else {
- 
- 		if ( $login->user_login == $username && $login->user_pass == $pwd ) {
- 			return true;
- 		} else {
- 			$error = __('<strong>Error</strong>: Incorrect password.');
- 			$pwd = '';
- 			return false;
- 		}
- 	}
- }
- 
  if (!function_exists('add_magic_quotes')) {
  	function add_magic_quotes($array) {
--- 2,5 ----

Index: wp-trackback.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-trackback.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** wp-trackback.php	23 Sep 2004 12:27:52 -0000	1.22
--- wp-trackback.php	4 Oct 2004 08:03:52 -0000	1.23
***************
*** 35,38 ****
--- 35,50 ----
  $excerpt = $_POST['excerpt'];
  $blog_name = $_POST['blog_name'];
+ $charset = $_POST['charset'];
+ 
+ if ($charset)
+ 	$charset = strtoupper( trim($charset) );
+ else
+ 	$charset = 'auto';
+ 
+ if ( function_exists('mb_convert_encoding') ) {
+ 	$title = mb_convert_encoding($title, get_settings('blog_charset'), $charset);
+ 	$excerpt = mb_convert_encoding($excerpt, get_settings('blog_charset'), $charset);
+ 	$blog_name = mb_convert_encoding($blog_name, get_settings('blog_charset'), $charset);
+ }
  
  if ( is_single() )