diff options
| author | Shane Caraveo <shane@php.net> | 2003-03-22 18:54:56 +0000 |
|---|---|---|
| committer | Shane Caraveo <shane@php.net> | 2003-03-22 18:54:56 +0000 |
| commit | cecc66d17bfc030c6210857b377c3a3350aed664 (patch) | |
| tree | c00cdef80432b5ef538d4ed4cca4e0098f8bf37f /main | |
| parent | c479e904ddaf1d94a18c84638e3df1109f02b616 (diff) | |
| download | php-git-cecc66d17bfc030c6210857b377c3a3350aed664.tar.gz | |
MFH
Diffstat (limited to 'main')
| -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 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); |