diff options
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index ccceb63488..2422392f9b 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -306,6 +306,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) { @@ -343,14 +351,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); |