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

diff --combined lib/setup/SetupClass.php
index 3b4f683d544b89184b9587d0085d396493603664,927aac5ff47a5810d8756a6e0cbb777fe20e5e71..fbcf9b5c7bb67aa146d4f00c67450be4102d5f42
--- 1/lib/setup/SetupClass.php
--- 2/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') {