MFH

diff --git a/main/php_ini.c b/main/php_ini.c
index 309a0e6c928f3bf70226a05dc3f4da95688a6603..dc1504994466db7578199fb29c680e3e4054c05e 100644 (file)
--- 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);