diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-20 19:50:29 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-20 19:50:29 -0400 |
| commit | f9307531a74a6b4162a8725faca22b9d70bb6f12 (patch) | |
| tree | 21b6befe79ea9a04996c16f2b995b7297ee851a9 /phpBB/install/database_update.php | |
| parent | 52c4726b5b8bf762b56d0fa06b24e09003d74811 (diff) | |
| parent | 8fa44cc3b9778f84ca20eab1c1d404c4f848eab4 (diff) | |
| download | forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.gz forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.bz2 forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.tar.xz forums-f9307531a74a6b4162a8725faca22b9d70bb6f12.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
[ticket/8542] Display custom profile fields in private messages
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a31de12edc..d58014c11e 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -999,6 +999,9 @@ function database_update_info() GROUPS_TABLE => array( 'group_teampage' => array('UINT', 0, 'after' => 'group_legend'), ), + PROFILE_FIELDS_TABLE => array( + 'field_show_on_pm' => array('BOOL', 0), + ), ), 'change_columns' => array( GROUPS_TABLE => array( @@ -2109,6 +2112,9 @@ function change_database_data(&$no_updates, $version) unset($table_ary); } + // Allow custom profile fields in pm templates + set_config('load_cpf_pm', '0'); + $no_updates = false; break; } |