diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-12-30 09:44:34 -0500 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-30 09:44:34 -0500 |
| commit | 29c0d920f41299d8a29ca3cb1dec5e44dcad55e2 (patch) | |
| tree | 3ab3fc02c55f40aabed12208cf167fab54e2e052 | |
| parent | 62d61a2f9a394d41506fc41f9c801e4f5fb49920 (diff) | |
| download | pfsense-29c0d920f41299d8a29ca3cb1dec5e44dcad55e2.zip pfsense-29c0d920f41299d8a29ca3cb1dec5e44dcad55e2.tar.gz | |
Fixed #5714
| -rw-r--r-- | src/conf.default/config.xml | 2 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 25 |
3 files changed, 27 insertions, 2 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 3eab8c8..acec3ac 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>13.2</version> + <version>13.4</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index f8fe866..9ac9c61 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "13.3", + "latest_config" => "13.4", "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 e3c3be1..14db11e 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4235,4 +4235,29 @@ function upgrade_132_to_133() { } } } + +// Determine the highest column number in use and set dashboardcolumns accordingly +function upgrade_133_to_134() { + global $config; + + if (!isset($config['widgets']['sequence']) || isset($config['system']['webgui']['dashboardcolumns'])) { + return; + } + + $cur_widgets = explode(',', trim($config['widgets']['sequence'])); + $maxcols = 2; + + foreach ($cur_widgets as $widget) { + list($file, $col, $display) = explode(':', $widget); + + if (($display != 'none') && ($display != 'hide')) { + preg_match('#[0-9]+$#', $col, $column); + if ($column[0] > $maxcols) { + $maxcols = $column[0]; + } + } + } + + $config['system']['webgui']['dashboardcolumns'] = $maxcols % 10; +} ?> |
