1 files changed, 16 insertions, 14 deletions

diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php
index 4025117f8..1a67ffcc4 100644
--- a/views/default/forms/admin/menu/save.php
+++ b/views/default/forms/admin/menu/save.php
@@ -3,9 +3,12 @@
  * Form body for setting up site menu
  */
 
+// @todo Could probably make this number configurable
+$num_featured_items = 6;
+
 // get site menu items
-global $CONFIG;
-$menu = $CONFIG->menus['site'];
+$menu = elgg_get_config('menus');
+$menu = $menu['site'];
 $builder = new ElggMenuBuilder($menu);
 $menu = $builder->getMenu('name');
 $menu_items = $menu['default'];
@@ -14,9 +17,9 @@ $featured_menu_names = elgg_get_config('site_featured_menu_names');
 
 $dropdown_values = array();
 foreach ($menu_items as $item) {
-	$dropdown_values[$item->getName()] = $item->getTitle();
+	$dropdown_values[$item->getName()] = $item->getText();
 }
-$dropdown_values[''] = elgg_echo('none');
+$dropdown_values[' '] = elgg_echo('none');
 
 ?>
 <div class="elgg-module elgg-module-inline">
@@ -29,17 +32,16 @@ echo elgg_view('output/longtext', array(
 	'value' => elgg_echo("admin:menu_items:description")
 ));
 
-// @todo Could probably make this number configurable
-for ($i=0; $i<6; $i++) {
-	if (array_key_exists($i, $featured_menu_names)) {
+for ($i=0; $i<$num_featured_items; $i++) {
+	if ($featured_menu_names && array_key_exists($i, $featured_menu_names)) {
 		$current_value = $featured_menu_names[$i];
 	} else {
-		$current_value = '';
+		$current_value = ' ';
 	}
 
 	echo elgg_view('input/dropdown', array(
 		'options_values' => $dropdown_values,
-		'internalname' => 'featured_menu_names[]',
+		'name' => 'featured_menu_names[]',
 		'value' => $current_value
 	));
 }
@@ -62,17 +64,17 @@ $custom_items = elgg_get_config('site_custom_menu_items');
 $name_str = elgg_echo('name');
 $url_str = elgg_echo('admin:plugins:label:website');
 
-echo '<ul class="elgg-simple-list">';
+echo '<ul class="elgg-list elgg-list-simple">';
 
 if (is_array($custom_items)) {
 	foreach ($custom_items as $title => $url) {
 		$name_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_titles[]',
+			'name' => 'custom_menu_titles[]',
 			'value' => $title
 		));
 
 		$url_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_urls[]',
+			'name' => 'custom_menu_urls[]',
 			'value' => $url
 		));
 
@@ -82,11 +84,11 @@ if (is_array($custom_items)) {
 
 $new = elgg_echo('new');
 $name_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_titles[]',
+	'name' => 'custom_menu_titles[]',
 ));
 
 $url_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_urls[]',
+	'name' => 'custom_menu_urls[]',
 ));
 
 echo "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input</li>