diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-29 20:17:54 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-29 20:17:54 +0000 |
| commit | 7e434bda73195ad81d728c97823c14c09383438d (patch) | |
| tree | c9af7225b4f82b0abfd9403fee4b3f0e439caa6e /engine | |
| parent | ce7eb8ee45b4222e9ea5e63ed6941f19239b969d (diff) | |
| download | elgg-7e434bda73195ad81d728c97823c14c09383438d.tar.gz elgg-7e434bda73195ad81d728c97823c14c09383438d.tar.bz2 | |
Fixes #2751 profile custom fields uses the config table now
git-svn-id: http://code.elgg.org/elgg/trunk@7754 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/users.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 25b269873..04e1eeff4 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1575,13 +1575,13 @@ function elgg_profile_fields_setup() { ); $loaded_default = array(); - if ($fieldlist = get_plugin_setting('user_defined_fields','profile')) { + if ($fieldlist = elgg_get_config('profile_custom_fields')) { if (!empty($fieldlist)) { - $fieldlistarray = explode(',',$fieldlist); + $fieldlistarray = explode(',', $fieldlist); $loaded_defaults = array(); - foreach($fieldlistarray as $listitem) { - if ($translation = get_plugin_setting("admin_defined_profile_{$listitem}", 'profile')) { - $type = get_plugin_setting("admin_defined_profile_type_{$listitem}", 'profile'); + foreach ($fieldlistarray as $listitem) { + if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) { + $type = elgg_get_config("admin_defined_profile_type_{$listitem}"); $loaded_defaults["admin_defined_profile_{$listitem}"] = $type; add_translation(get_current_language(), array("profile:admin_defined_profile_{$listitem}" => $translation)); } @@ -1594,10 +1594,10 @@ function elgg_profile_fields_setup() { $profile_defaults = $loaded_defaults; } - $CONFIG->profile = elgg_trigger_plugin_hook('profile:fields', 'profile', NULL, $profile_defaults); + $CONFIG->profile_fields = elgg_trigger_plugin_hook('profile:fields', 'profile', NULL, $profile_defaults); // register any tag metadata names - foreach ($CONFIG->profile as $name => $type) { + foreach ($CONFIG->profile_fields as $name => $type) { if ($type == 'tags') { elgg_register_tag_metadata_name($name); // register a tag name translation |