summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-06-09 15:06:01 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-06-09 15:06:01 -0400
commit901aa044a5c13474f2ba52b1e1963e9684e86a0b (patch)
tree9c10611b0736e07251768ecb73fed99bd32d18e6
parent4a1ee8ac314007ee06f71362eea5d0a77fa4d7e0 (diff)
downloadpfsense-901aa044a5c13474f2ba52b1e1963e9684e86a0b.zip
pfsense-901aa044a5c13474f2ba52b1e1963e9684e86a0b.tar.gz
Include rrd.inc if dump_rrd_to_xml() is not found to be included to avoid Fatal error: Call to undefined function dump_rrd_to_xml() in /etc/inc/upgrade_config.inc on line 1752
-rw-r--r--etc/inc/upgrade_config.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 2bd25ed..50b6ad0 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -34,11 +34,13 @@ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
pfSense_MODULE: config
*/
+if(!function_exists("dump_rrd_to_xml"))
+ require("rrd.inc");
+
/* Upgrade functions must be named:
* upgrade_XXX_to_YYY
* where XXX == previous version, zero padded, and YYY == next version, zero padded
*/
-
function upgrade_010_to_011() {
global $config;
$opti = 1;
@@ -2062,4 +2064,4 @@ function upgrade_063_to_064() {
}
}
-?>
+?> \ No newline at end of file
OpenPOWER on IntegriCloud