From cecc66d17bfc030c6210857b377c3a3350aed664 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <shane@php.net>
Date: Sat, 22 Mar 2003 18:54:56 +0000
Subject: MFH

---
 main/php_ini.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'main/php_ini.c')

diff --git a/main/php_ini.c b/main/php_ini.c
index 309a0e6c92..dc15049944 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -273,6 +273,14 @@ int php_init_config()
 		 * Prepare search path
 		 */
 
+		/* Add environment location */
+		if (env_location[0]) {
+			if (*php_ini_search_path) {
+				strcat(php_ini_search_path, paths_separator);
+			}
+			strcat(php_ini_search_path, env_location);
+		}
+
 		/* Add cwd */
 #ifdef INI_CHECK_CWD
 		if (strcmp(sapi_module.name, "cli")!=0) {	
@@ -310,14 +318,6 @@ int php_init_config()
 			efree(binary_location);
 		}
 
-		/* Add environment location */
-		if (env_location[0]) {
-			if (*php_ini_search_path) {
-				strcat(php_ini_search_path, paths_separator);
-			}
-			strcat(php_ini_search_path, env_location);
-		}
-
 		/* Add default location */
 #ifdef PHP_WIN32
 		default_location = (char *) emalloc(MAXPATHLEN+1);
-- 
cgit v1.2.1