From 24d327ba2bd99bcfeb5628285ffdcaca0c33b1d9 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Thu, 16 Jul 2009 12:18:13 +0000 Subject: [PATCH] CS --- Zend/zend_ini.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index b336878f7f..23e3a889e9 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -47,6 +47,7 @@ static int zend_remove_ini_entries(zend_ini_entry *ini_entry, int *module_number static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS_DC) /* {{{ */ { int result = FAILURE; + if (ini_entry->modified) { if (ini_entry->on_modify) { zend_try { @@ -56,7 +57,7 @@ static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS result = ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC); } zend_end_try(); } - if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) { + if (stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) { /* runtime failure is OK */ return 1; } -- 2.40.0