Fixing hidden settings_to_avoid array

main/admin/settings.lib.php

@@ -1044,8 +1044,7 @@ function generate_settings_form($settings, $settings_by_access_list) {
     $count_settings = count($settings);
     
     foreach ($settings as $row) {           
-        
+    	if (in_array($row['variable'], array_keys($settings_to_avoid))) { continue; }
-    	if (in_array($row['variable'], $settings_to_avoid)) { continue; }
 
         $anchor_name = $row['variable'].(!empty($row['subkey']) ? '_'.$row['subkey'] : '');
         $form->addElement('html',"\n<a name=\"$anchor_name\"></a>\n");

main/admin/settings.php

@@ -305,7 +305,7 @@ $action_images['editor']        = 'html_editor.png';
 $action_images['timezones']     = 'timezone.png';
 $action_images['extra']     	= 'wizard.png';
 $action_images['tracking']     	= 'statistics.png';
-$action_images['gradebook2']    = 'gradebook.png';
+$action_images['gradebook']     = 'gradebook.png';
 
 $action_images['search']        = 'search.png';
 $action_images['stylesheets']   = 'stylesheets.png';

main/gradebook/lib/fe/scoredisplayform.class.php

@@ -93,7 +93,6 @@ class ScoreDisplayForm extends FormValidator
 				'<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error -->&nbsp{element}
                     <a href="javascript:plusItem(' . ($counter+1) . ')"><img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="../img/icons/22/add.png" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></img></a>
         			<a href="javascript:minItem(' . ($counter) . ')"><img style="display: '.(($counter>=$nr_items && $counter!=1)?'inline':'none').';" id="min-' . $counter . '" src="../img/delete.png" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></img></a>				
-				
 				</div></p></div>';
 
 				$scorebetw= array ();