summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Beaver <sbeaver@netgate.com>2017-08-15 20:17:59 -0400
committerSteve Beaver <sbeaver@netgate.com>2017-08-15 20:17:59 -0400
commitd800d0f5babe2f6d7bb9a7de8afa709c28e930df (patch)
treec63036122af626ef811236bcea9dd600a6abe273
parentef68bfa699f7fb1c68cb502dbe23ed3546b94b20 (diff)
downloadpfsense-d800d0f5babe2f6d7bb9a7de8afa709c28e930df.zip
pfsense-d800d0f5babe2f6d7bb9a7de8afa709c28e930df.tar.gz
Revert config version to 15.8 and remove upgrade script
-rw-r--r--src/etc/inc/globals.inc2
-rw-r--r--src/etc/inc/upgrade_config.inc34
2 files changed, 1 insertions, 35 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index d891282..e7a98d0 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -105,7 +105,7 @@ $g = array(
"disablecrashreporter" => false,
"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
"debug" => false,
- "latest_config" => "15.9",
+ "latest_config" => "15.8",
"nopkg_platforms" => array("cdrom"),
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index d24e546..c4a7871 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -5057,38 +5057,4 @@ function upgrade_157_to_158() {
}
}
-/* Force the Netgate Services and Support widget to be active on upgrade.
- New widget is added at the top of column 2 */
-function upgrade_158_to_159() {
- global $config;
-
- if (strpos($config['widgets']['sequence'], 'netgate_services_and_support') === false) {
-
- $widgets = explode(",", $config['widgets']['sequence']);
- $cnt = count($widgets);
- $col2 = $cnt;
- $newsequence = array();
-
- // Locate the firt column 2 widget
- for ($idx=0;$idx<$cnt;$idx++) {
- if (strpos($widgets[$idx], 'col2') !== false) {
- $col2 = $idx;
- break;
- }
- }
-
- // Loop through the widgets inserting the new widget before the first col2 widget
- for ($old=0,$new=0;$old<$cnt;$old++,$new++) {
- $newsequence[$new] = $widgets[$old];
-
- if ($old == ($col2 - 1)) {
- $new++;
- $newsequence[$new] = "netgate_services_and_support:col2:open:0";
- }
- }
-
- $config['widgets']['sequence'] = implode(",", $newsequence);
- }
-}
-
?>
OpenPOWER on IntegriCloud