mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop

Browse Source 
* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php
This commit is contained in:
Oleg Pudeyev
2011-05-20 19:50:29 -04:00
parent 52c4726b5b 8fa44cc3b9
commit f9307531a7
17 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/install/database_update.php
View File

@@ -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;
}