diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-02-25 16:04:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-02-25 16:04:22 +0100 |
| commit | c2974187e53e1da2516075581b854a6dc3a95a6f (patch) | |
| tree | 90e3bcb580d2f512146993d8b42d96142e26d920 /phpBB/develop | |
| parent | c1b4cdb1883bb6771a303624ece131eb5c7f071d (diff) | |
| parent | 558ecdcd40fb13bb264839c210996c47e3e81bcb (diff) | |
| download | forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.gz forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.bz2 forums-c2974187e53e1da2516075581b854a6dc3a95a6f.tar.xz forums-c2974187e53e1da2516075581b854a6dc3a95a6f.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (119 commits)
[ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
[ticket/11358] Changed the name of post parameter.
[ticket/11358] Changed the action parameter value to represent the link.
[ticket/11358] Enabled link making all users default for a group.
[ticket/11358] Removed redundant code and referred proper variable.
[ticket/11358] Success message even without selecting a user.
[ticket/11355] Referred proper variable when validating selection.
[ticket/11355] Wrong error message when no user is selected.
[ticket/10896] Add missing email validation lost in develop merge
[ticket/7262] Add note about set_config() not updating is_dynamic.
[ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
[ticket/7262] Backport set_config() and set_config_count() docs from develop.
[ticket/11122] Move rxu to 'Former Contributors' section.
[ticket/11122] Add EXreaction to docs/AUTHORS.
[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
[ticket/11361] Make sure that array passed to strtr() has the proper format.
[ticket/11179] remove extra & in function call
[ticket/11179] correct start parameter in sphinx search
[ticket/11179] correct start parameter in native author search
[ticket/11179] correct start parameter in native keyword search
...
Conflicts:
phpBB/config/tables.yml
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/benchmark.php | 5 | ||||
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 14 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 1 |
3 files changed, 18 insertions, 2 deletions
diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php index 6517954dfe..c867b9262e 100644 --- a/phpBB/develop/benchmark.php +++ b/phpBB/develop/benchmark.php @@ -377,6 +377,7 @@ function make_user($username) $viewemail = 0; $aim = 0; $yim = 0; + $msn = 0; $attachsig = 1; $allowsmilies = 1; $allowhtml = 1; @@ -421,8 +422,8 @@ function make_user($username) } - $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, 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', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', $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_occ, user_from, user_interests, 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', '$occupation', '$location', '$interests', '$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, '')"; diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index c6012a633f..550396c7ea 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1273,6 +1273,19 @@ function get_schema_struct() ), ); + $schema_data['phpbb_migrations'] = array( + 'COLUMNS' => array( + 'migration_name' => array('VCHAR', ''), + 'migration_depends_on' => array('TEXT', ''), + 'migration_schema_done' => array('BOOL', 0), + 'migration_data_done' => array('BOOL', 0), + 'migration_data_state' => array('TEXT', ''), + 'migration_start_time' => array('TIMESTAMP', 0), + 'migration_end_time' => array('TIMESTAMP', 0), + ), + 'PRIMARY_KEY' => 'migration_name', + ); + $schema_data['phpbb_modules'] = array( 'COLUMNS' => array( 'module_id' => array('UINT', NULL, 'auto_increment'), @@ -1836,6 +1849,7 @@ function get_schema_struct() 'user_icq' => array('VCHAR:15', ''), 'user_aim' => array('VCHAR_UNI', ''), 'user_yim' => array('VCHAR_UNI', ''), + 'user_msnm' => array('VCHAR_UNI', ''), 'user_jabber' => array('VCHAR_UNI', ''), 'user_website' => array('VCHAR_UNI:200', ''), 'user_occ' => array('TEXT_UNI', ''), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index ca738aabf6..7f82ebfeab 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -1265,6 +1265,7 @@ function get_schema_struct() 'user_icq' => array('VCHAR:15', ''), 'user_aim' => array('VCHAR_UNI', ''), 'user_yim' => array('VCHAR_UNI', ''), + 'user_msnm' => array('VCHAR_UNI', ''), 'user_jabber' => array('VCHAR_UNI', ''), 'user_website' => array('VCHAR_UNI:200', ''), 'user_occ' => array('TEXT_UNI', ''), |