1 files changed, 26 insertions, 22 deletions
diff --git a/mod/profile/defaultprofile.php b/mod/profile/defaultprofile.php
index 55638ba02..34e0af2d3 100644
--- a/mod/profile/defaultprofile.php
+++ b/mod/profile/defaultprofile.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Elgg profile index
- * 
+ *
  * @package ElggProfile
  * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
  * @author Curverider Ltd <info@elgg.com>
@@ -19,31 +19,35 @@ $form = elgg_view('profile/editdefaultprofile');
 
 set_context('search');
 
-
 // List form elements
 $n = 0;
 $loaded_defaults = array();
-while ($translation = get_plugin_setting("admin_defined_profile_$n", 'profile'))
-{
-	$type = get_plugin_setting("admin_defined_profile_type_$n", 'profile');
-	$listing .= elgg_view("profile/", array('value' => $translation));	
-	
-	$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';					
-
-	$listing .= "<p class=\"{$even_odd}\"><b>$translation: </b>";
-	$listing .= elgg_view("output/{$type}",array('value' => " [$type]"));
-	$listing .= "</p>";
-	
-	$n++;
+$items = array();
+if ($fieldlist = get_plugin_setting('user_defined_fields', 'profile')) {
+	$fieldlistarray = explode(',', $fieldlist);
+	foreach($fieldlistarray as $listitem) {
+		if ($translation = get_plugin_setting("admin_defined_profile_{$listitem}", 'profile')) {
+			$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');
+			$items[] = $item;
+		}
+	}
 }
 
-$listing .= "<div class='default_profile_reset'>" . elgg_view('input/form', 
-	array(
-		'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'),'class' => 'action_button disabled')), 
-		'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset'
-	)
-) . "</div>";
+$listing = elgg_view('profile/editdefaultprofileitems',array('items' => $items, 'fieldlist' => $fieldlist));
+
+$listing .= elgg_view('input/form',
+						array (
+							'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'))),
+							'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset'
+						)
+					);
 
 set_context('admin');
-	
-page_draw(elgg_echo('profile:edit:default'),elgg_view_layout("one_column_with_sidebar", $title . $form . $listing));
-\ No newline at end of file
+
+$body = elgg_view_layout("one_column_with_sidebar", $title . $form . $listing);
+
+page_draw(elgg_echo('profile:edit:default'), $body);
+\ No newline at end of file