From fed73b75cf6dede164c89fce0e0c85dba3fbeca8 Mon Sep 17 00:00:00 2001 From: Nick Harper Date: Fri, 25 May 2012 10:08:28 -0700 Subject: [PATCH] Change order of include_path Summary: With the current order of the include_path (checking in the parent dir of arcanist last), it is possible to load the wrong libphutil which can have bad side effects. Instead, the first place we check in include_path should be the parent dir of arcanist. (The issue I ran into is that I had a checkout of libphutil in my homedir, and I was running arc from my homedir with --load-phutil-library to load the libraries, and since ./ is the default value for include_path, we were loading libphutil from my homedir instead of from alongside the copy of arc that I was running. The libphutil alongside that copy of arc worked, but my checkout of libphutil had D2545 in it, so it was broken.) Test Plan: ran arc (not in my homedir) with a broken libphutil in my homedir in my homedir and it worked (before this change it didn't) Reviewers: jungejason, vrana, epriestley Reviewed By: vrana CC: aran, Koolvin Differential Revision: https://secure.phabricator.com/D2576 --- scripts/__init_script__.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/__init_script__.php b/scripts/__init_script__.php index 35495d91..c099d526 100644 --- a/scripts/__init_script__.php +++ b/scripts/__init_script__.php @@ -20,7 +20,7 @@ $include_path = ini_get('include_path'); $parent_dir = dirname(dirname(dirname(__FILE__))); -ini_set('include_path', $include_path.PATH_SEPARATOR.$parent_dir); +ini_set('include_path', $parent_dir.PATH_SEPARATOR.$include_path); @include_once 'libphutil/scripts/__init_script__.php'; if (!@constant('__LIBPHUTIL__')) { echo "ERROR: Unable to load libphutil. Update your PHP 'include_path' to ".