Merge from develop
This commit is contained in:
commit
a843858654
46 changed files with 2768 additions and 2499 deletions
|
@ -1107,7 +1107,7 @@ function settings_content(&$a)
|
|||
$a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY;
|
||||
}
|
||||
|
||||
$pageset_tpl = get_markup_template('pagetypes.tpl');
|
||||
$pageset_tpl = get_markup_template('settings_pagetypes.tpl');
|
||||
|
||||
$pagetype = replace_macros($pageset_tpl, array(
|
||||
'$account_types' => t('Account Types'),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue