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 05b3bba553..c4abee2b67 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -310,6 +310,14 @@ int php_init_config(TSRMLS_D) free_ini_search_path = 1; php_ini_search_path[0] = 0; + /* 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); + } + #ifdef PHP_WIN32 /* Add registry location */ reg_location = GetIniPathFromRegistry(); @@ -322,14 +330,6 @@ int php_init_config(TSRMLS_D) } #endif - /* 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 (only with CLI) */ if (strcmp(sapi_module.name, "cli") == 0) { if (*php_ini_search_path) { |