Project

General

Profile

« Previous | Next » 

Revision 03226d75

Added by Renato Botelho over 10 years ago

Use newline to separate unbound custom options during config upgrade, it should fix #4104

View differences:

etc/inc/upgrade_config.inc
3458 3458 
	/* Following options were removed, bring them as custom_options */
3459 3459 
	if (isset($pkg['stats']) && $pkg['stats'] == "on") {
3460 3460 
		if (isset($pkg['stats_interval']))
3461 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "statistics-interval: {$pkg['stats_interval']}";
3461 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "statistics-interval: {$pkg['stats_interval']}";
3462 3462 
		if (isset($pkg['cumulative_stats']))
3463 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "statistics-cumulative: {$pkg['cumulative_stats']}";
3463 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "statistics-cumulative: {$pkg['cumulative_stats']}";
3464 3464 
		if (isset($pkg['extended_stats']) && $pkg['extended_stats'] == "on")
3465 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "extended-statistics: yes";
3465 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "extended-statistics: yes";
3466 3466 
		else
3467 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : ";") . "extended-statistics: no";
3467 
			$new['custom_options'] .= (empty($new['custom_options']) ? "" : "\n") . "extended-statistics: no";
3468 3468 
	}
3469 3469 

  		




  3470
  3470
  
    
	$new['acls'] = array();


  		












Also available in:  Unified diff