diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-11 02:18:16 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-11 02:18:16 +0100 |
| commit | 0b2b76f9514fed54c92e439eadbef6dc80290cd3 (patch) | |
| tree | 779a80bc5d106afaff20a28675ba7e69771a7262 /phpBB/develop | |
| parent | b088bf864bf5827c1801c53c0af1b5a2f89f5b16 (diff) | |
| parent | 5550f0fa870d531879d53d1bfdd76dcd29a16ce6 (diff) | |
| download | forums-0b2b76f9514fed54c92e439eadbef6dc80290cd3.tar forums-0b2b76f9514fed54c92e439eadbef6dc80290cd3.tar.gz forums-0b2b76f9514fed54c92e439eadbef6dc80290cd3.tar.bz2 forums-0b2b76f9514fed54c92e439eadbef6dc80290cd3.tar.xz forums-0b2b76f9514fed54c92e439eadbef6dc80290cd3.zip | |
Merge pull request #2010 from nickvergessen/ticket/12169
Ticket/12169 Convert location user field to profile field
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/benchmark.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php index 16f10b1225..d5eaed3bc7 100644 --- a/phpBB/develop/benchmark.php +++ b/phpBB/develop/benchmark.php @@ -368,7 +368,6 @@ function make_user($username) $email = "nobody@localhost"; $icq = "12345678"; $website = "http://www.phpbb.com"; - $location = "phpBB world hq"; $signature = "$username: phpBB tester."; $signature_bbcode_uid = ""; $avatar_filename = ""; @@ -420,8 +419,8 @@ function make_user($username) } - $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_from, 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', '$location', '$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_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 .= "1, '')"; |