1 files changed, 4 insertions, 9 deletions
diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php
index d5eaed3bc7..631b7d05ca 100644
--- a/phpBB/develop/benchmark.php
+++ b/phpBB/develop/benchmark.php
@@ -143,7 +143,7 @@ function filldb($newposts)
 		if ((rand(0,30) < 1) || ($forum_topic_count[$forum] == 0))
 		{
 			// create a new topic 1 in 30 times (or when there are none);
-			$topic = make_topic($userid, "Testing topic $i", $forum);
+			make_topic($userid, "Testing topic $i", $forum);
 			$forum_topic_count[$forum]++;
 		} 
 		else 
@@ -313,7 +313,7 @@ function make_post($new_topic_id, $forum_id, $user_id, $post_username, $text, $m
 		else
 		{
 			// Rollback
-			if($db->sql_layer == "mysql")
+			if($db->get_sql_layer() == "mysql")
 			{
 				$sql = "DELETE FROM " . POSTS_TABLE . "
 					WHERE post_id = $new_post_id";
@@ -366,15 +366,10 @@ function make_user($username)
 
 	$password = md5("benchpass");
 	$email = "nobody@localhost";
-	$icq = "12345678";
-	$website = "http://www.phpbb.com";
 	$signature = "$username: phpBB tester.";
 	$signature_bbcode_uid = "";
 	$avatar_filename = "";
 	$viewemail = 0;
-	$aim = 0;
-	$yim = 0;
-	$msn = 0;
 	$attachsig = 1;
 	$allowsmilies = 1;
 	$allowhtml = 1;
@@ -419,8 +414,8 @@ function make_user($username)
 	}
 
 
-	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
-		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
+	$sql = "INSERT INTO " . USERS_TABLE . "	(user_id, username, user_regdate, user_password, user_email, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey)
+		VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, ";
 
 	
 	$sql .= "1, '')";