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

2 files changed, 5 insertions, 5 deletions

diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index bbd6dccd2..d14452f47 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -5,15 +5,15 @@
 $n = 0;
 $loaded_defaults = array();
 $items = array();
-if ($fieldlist = get_plugin_setting('user_defined_fields', 'profile')) {
+if ($fieldlist = elgg_get_config('profile_custom_fields')) {
 	$fieldlistarray = explode(',', $fieldlist);
-	foreach($fieldlistarray as $listitem) {
-		if ($translation = get_plugin_setting("admin_defined_profile_{$listitem}", 'profile')) {
+	foreach ($fieldlistarray as $listitem) {
+		if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) {
 			$item = new stdClass;
 			$item->translation = $translation;
 			$item->shortname = $listitem;
 			$item->name = "admin_defined_profile_{$listitem}";
-			$item->type = get_plugin_setting("admin_defined_profile_type_{$listitem}", 'profile');
+			$item->type = elgg_get_config("admin_defined_profile_type_{$listitem}");
 			$items[] = $item;
 		}
 	}
diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index c9117c8e7..108e7f9f2 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -13,7 +13,7 @@
 </p>
 <?php
 
-$profile_fields = elgg_get_config('profile');
+$profile_fields = elgg_get_config('profile_fields');
 if (is_array($profile_fields) && count($profile_fields) > 0) {
 	foreach ($profile_fields as $shortname => $valtype) {
 		$metadata = get_metadata_byname($vars['entity']->guid, $shortname);