From 0a4e1e0f1bcdded5dfeb9ac560a689c3bd60aa5a Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 15 Mar 2014 14:04:11 +0100 Subject: [PATCH] Revert "Don't add redundant includedir INSTALLDIR.'/extlib/'" This reverts commit 31d8069779357fbcadcaf6a0852980160131f0a4. I didn't notice any errors because I had php-pear installed. :] --- scripts/commandline.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/commandline.inc b/scripts/commandline.inc index 2bf1f0fc36..d7ee158801 100644 --- a/scripts/commandline.inc +++ b/scripts/commandline.inc @@ -36,7 +36,13 @@ ini_set("max_input_time", "0"); set_time_limit(0); mb_internal_encoding('UTF-8'); -require_once INSTALLDIR . '/extlib/Console/Getopt.php'; +// Add extlib to our path so we can get Console_Getopt + +$_extra_path = array(INSTALLDIR.'/extlib/'); + +set_include_path(implode(PATH_SEPARATOR, $_extra_path) . PATH_SEPARATOR . get_include_path()); + +require_once 'Console/Getopt.php'; // Note: $shortoptions and $longoptions should be pre-defined! -- 2.39.5