WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@301 7be80a69-a1ef-0310-a953-fb0f7c49ff36

4 files changed, 5 insertions, 5 deletions

diff --git a/wp-inst/wp-admin/profile-update.php b/wp-inst/wp-admin/profile-update.php
index a5b75a5..8e1cc78 100644
--- a/wp-inst/wp-admin/profile-update.php
+++ b/wp-inst/wp-admin/profile-update.php
@@ -38,7 +38,7 @@ $aim = wp_specialchars($_POST['aim']);
 $yim = wp_specialchars($_POST['yim']);
 $email = wp_specialchars($_POST['email']);
 $url = wp_specialchars($_POST['url']);
-$url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $newuser_url) ? $newuser_url : 'http://' . $newuser_url; 
+$url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $url) ? $url : 'http://' . $url; 
 $user_description = $_POST['user_description'];
 
 $result = $wpdb->query("UPDATE $wpdb->users SET $updatepassword user_email='$email', user_url='$url', user_nicename = '$nicename', display_name = '$display_name' WHERE ID = '$user_ID'");
diff --git a/wp-inst/wp-admin/upgrade-schema.php b/wp-inst/wp-admin/upgrade-schema.php
index 3ddf446..c2d4a14 100644
--- a/wp-inst/wp-admin/upgrade-schema.php
+++ b/wp-inst/wp-admin/upgrade-schema.php
@@ -53,7 +53,7 @@ CREATE TABLE $wpdb->links (
   link_name varchar(255) NOT NULL default '',
   link_image varchar(255) NOT NULL default '',
   link_target varchar(25) NOT NULL default '',
-  link_category int(11) NOT NULL default '0',
+  link_category bigint(20) NOT NULL default '0',
   link_description varchar(255) NOT NULL default '',
   link_visible enum('Y','N') NOT NULL default 'Y',
   link_owner int(11) NOT NULL default '1',
diff --git a/wp-inst/wp-admin/users.php b/wp-inst/wp-admin/users.php
index 5fcb56a..15c74c4 100644
--- a/wp-inst/wp-admin/users.php
+++ b/wp-inst/wp-admin/users.php
@@ -243,7 +243,7 @@ default:
 	
 	foreach($userids as $userid) {
 		$tmp_user = new WP_User($userid);
-		$roles = array_values($tmp_user->roles);
+		$roles = $tmp_user->roles;
 		$role = $roles[0];
 		if( $role == '' )
 		    $role = 'inactive';
diff --git a/wp-inst/wp-includes/vars.php b/wp-inst/wp-includes/vars.php
index 2e1dcec..a0a5032 100644
--- a/wp-inst/wp-includes/vars.php
+++ b/wp-inst/wp-includes/vars.php
@@ -103,7 +103,7 @@ uksort($wpsmiliestrans, 'smiliescmp');
 foreach($wpsmiliestrans as $smiley => $img) {
 	$wp_smiliessearch[] = $smiley;
 	$smiley_masked = htmlspecialchars( trim($smiley) , ENT_QUOTES);
-	$wp_smiliesreplace[] = " <img src='" . get_settings('siteurl') . "/wp-images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
+	$wp_smiliesreplace[] = " <img src='" . get_settings('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
 }
 
-?>
\ No newline at end of file
+?>