Merge 10 -> 10.1 and 10.1 -> 10.2 function upgrade since the recent changes done on 2.1.1 for Ticket #3441

1 files changed, 2 insertions, 5 deletions

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 088a672..db33e1c 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3163,7 +3163,7 @@ function upgrade_099_to_100() {
 	install_cron_job("/usr/bin/nice -n20 newsyslog", false);
 }
 
-function upgrade_100_to_101() {
+function upgrade_101_to_102() {
 	global $config, $g;
 
 	if (!is_array($config['captiveportal']))
@@ -3176,11 +3176,8 @@ function upgrade_100_to_101() {
 		foreach ($cp['passthrumac'] as $idx => $passthrumac)
 			$config['captiveportal'][$cpzone]['passthrumac'][$idx]['action'] = 'pass';
 	}
-}
 
-/* Convert OpenVPN Compression option to the new style */
-function upgrade_101_to_102() {
-	global $config;
+	/* Convert OpenVPN Compression option to the new style */
 	// Nothing to do if there is no OpenVPN tag
 	if (!isset($config['openvpn']) || !is_array($config['openvpn']))
 		return;