From 0273e128f432c0a683d9c68cfd7d4bd29793c925 Mon Sep 17 00:00:00 2001 From: ThomasBarris Date: Tue, 18 Sep 2018 21:28:05 +0200 Subject: [PATCH] change variables for class SetupClass.php instantiation --- lib/setup/SetupClass.php | 2 +- utils/setup.php | 2 +- utils/update.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php index f31c2353..3b4f683d 100755 --- a/lib/setup/SetupClass.php +++ b/lib/setup/SetupClass.php @@ -16,7 +16,7 @@ class SetupFunctions protected $oDB = null; // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData // pgsqlRunPartitionScript, calculatePostcodes, ..if no already set - public function __construct($aCMDResult, $callingFunction = 'setup') + public function __construct($callingFunction, array $aCMDResult = array()) { // by default, use all but one processor, but never more than 15. $this->iInstances = isset($aCMDResult['threads']) diff --git a/utils/setup.php b/utils/setup.php index 5bc2a6f9..bdd3f03b 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -71,7 +71,7 @@ if ($aCMDResult['osmosis-init']) { // ****************************************************** // instantiate Setup class -$cSetup = new SetupFunctions($aCMDResult); +$cSetup = new SetupFunctions('setup', $aCMDResult); // ******************************************************* // go through complete process if 'all' is selected or start selected functions diff --git a/utils/update.php b/utils/update.php index 9175a617..dc8389ab 100755 --- a/utils/update.php +++ b/utils/update.php @@ -106,7 +106,7 @@ if ($aResult['init-updates']) { if (!$aResult['no-update-functions']) { // instantiate setupClass to use the function therein - $cSetup = new SetupFunctions($aResult, 'update'); + $cSetup = new SetupFunctions('update'); $cSetup->createFunctions(); } -- 2.43.2