From: ThomasBarris <thomas.barris@googlemail.com>
Date: Thu, 23 Aug 2018 07:24:51 +0000 (+0200)
Subject: delete PHP_BIN from default and add @PHP_BIN@ to passthru function in update.php
X-Git-Tag: v3.2.0~9^2~2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/6577be3744c64f2381f9a52d53d4204db412665e

delete PHP_BIN from default and add @PHP_BIN@ to passthru function in update.php
---

diff --git a/settings/defaults.php b/settings/defaults.php
index 8fc5b89e..8cdbcb5a 100644
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -47,7 +47,6 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_ExtraDataPath', CONST_BasePath.'/data');
 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
 @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
-@define('CONST_PHP_Binary', '@PHP_BIN@');
 @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
 @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
 
diff --git a/utils/update.php b/utils/update.php
index 46f70062..b207fd6c 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -101,7 +101,7 @@ if ($aResult['init-updates']) {
     if (!$aResult['no-update-functions']) {
         $sSetup = CONST_InstallPath.'/utils/setup.php';
         $iRet = -1;
-        passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
+        passthru(@PHP_BIN@.' --create-functions --enable-diff-updates', $iRet);
         if ($iRet != 0) {
             fail('Error running setup script');
         }