Index: branches/5.1.x/core/units/users/users_config.php =================================================================== diff -u -N -r12657 -r13086 --- branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 12657) +++ branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 13086) @@ -1,6 +1,6 @@ 'in-portal:system', 'icon' => 'conf_users', 'label' => 'la_title_Users', + 'use_parent_header' => 1, 'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'), 'permissions' => Array ('view'), 'priority' => 2, @@ -379,8 +380,8 @@ 'option_key_field'=>'DestAbbr','option_title_field'=>'Translation', 'not_null' => '1','default' => ''), 'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0), - 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), - 'Modified' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'not_null' => '1', 'default' => '#NOW#' ), + 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 1), + 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => null), 'tz' => Array('type' => 'int','default' => 0), 'ip' => Array('type' => 'string','default' => null), @@ -389,6 +390,11 @@ 'PwResetConfirm' => Array('type' => 'string','default' => null), 'PwRequestTime' => Array('type' => 'int','default' => null), 'MinPwResetDelay' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(300 => '5', 600 => '10', 900 => '15', 1800 => '30', 3600 => '60'), 'use_phrases' => 0, 'not_null' => '1', 'default' => 1800), + 'AdminLanguage' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Language ORDER BY PackName', 'option_key_field' => 'LanguageId', 'option_title_field' => 'LocalName', + 'default' => NULL + ), ), 'VirtualFields' => Array(