MFH: Fixed bug: #22011 (-n must ignore all ini files)

diff --git a/main/php_ini.c b/main/php_ini.c
index 747ef5f05f874b77054619f7504ca42325ddb09c..8b1b7d1c1bf07cd38ffedeedb304bb6f67523406 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -400,7 +400,7 @@ int php_init_config()
 
        /* If the config_file_scan_dir is set at compile-time, go and scan this directory and
         * parse any .ini files found in this directory. */
-       if(strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+       if (!sapi_module.php_ini_ignore && strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
                struct dirent **namelist;
                int ndir, i;