From: ThomasBarris <thomas.barris@googlemail.com>
Date: Tue, 18 Sep 2018 19:29:24 +0000 (+0200)
Subject: Merge branch 'updatePHP' of https://github.com/ThomasBarris/Nominatim into updatePHP
X-Git-Tag: v3.3.0~84^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/e92b54b869f3b3d1828b3c6468a216e2f56a5043?ds=sidebyside;hp=-c

Merge branch 'updatePHP' of https://github.com/ThomasBarris/Nominatim into updatePHP
---

e92b54b869f3b3d1828b3c6468a216e2f56a5043
diff --combined lib/setup/SetupClass.php
index 3b4f683d,927aac5f..fbcf9b5c
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@@ -16,7 -16,7 +16,7 @@@ class SetupFunction
      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'])
@@@ -64,7 -64,7 +64,7 @@@
          }
  
          // if class is instantiated by update.php, we have to set EnableDiffUpdates to true
-         // otherwise set to value provided comand line to setup.php
+         // otherwise set to value provided by setup.php's command line arg array
          if ($callingFunction == 'update') {
              $this->bEnableDiffUpdates = true;
          } elseif ($callingFunction == 'setup') {