From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 11 Jan 2011 08:31:21 +0000 (+0300)
Subject: fix PHP_EXECUTABLE declaration not being properly overriden in config.php (closes... 
X-Git-Tag: 1.5.1~13
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=86268d8ba0baaaef3372abacc8bc77513705d562;p=tt-rss.git

fix PHP_EXECUTABLE declaration not being properly overriden in config.php (closes #296)
---

diff --git a/update.php b/update.php
index 873928b6..e0c46027 100755
--- a/update.php
+++ b/update.php
@@ -2,15 +2,15 @@
 <?php
 	define('DISABLE_SESSIONS', true);
 
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
-
 	require_once "functions.php";
 	require_once "sanity_check.php";
 	require_once "config.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
 
+	if (!defined('PHP_EXECUTABLE'))
+		define('PHP_EXECUTABLE', '/usr/bin/php');
+
 	$op = $argv[1];
 
 	if (!$op || $op == "-help") {