summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.lib.inc
diff options
context:
space:
mode:
authorVinicius Coque <vinicius.coque@bluepex.com>2011-03-31 13:34:36 -0300
committerVinicius Coque <vinicius.coque@bluepex.com>2011-03-31 13:34:36 -0300
commit9158988035a48f77a83d81fc31fc649d2fade3e7 (patch)
tree4381f25e92a64e208d70e997fea25be881313220 /etc/inc/config.lib.inc
parentbca0472d5589beefe197858dfe10739108196c62 (diff)
parent78544d4a99c90f3c19b3cd53c2f1873b625c21bf (diff)
downloadpfsense-9158988035a48f77a83d81fc31fc649d2fade3e7.zip
pfsense-9158988035a48f77a83d81fc31fc649d2fade3e7.tar.gz
Merge remote-tracking branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/config.lib.inc')
-rw-r--r--etc/inc/config.lib.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc
index 9a5bd12..5b84cfa 100644
--- a/etc/inc/config.lib.inc
+++ b/etc/inc/config.lib.inc
@@ -404,7 +404,8 @@ function convert_config() {
$cur = $config['version'] * 10;
$next = $cur + 1;
$migration_function = sprintf('upgrade_%03d_to_%03d', $cur, $next);
- $migration_function();
+ if (function_exists($migration_function))
+ $migration_function();
$migration_function = "{$migration_function}_custom";
if (function_exists($migration_function))
$migration_function();
OpenPOWER on IntegriCloud