svn: php/php-src/trunk/Zend/ zend_ini.c
| From: | Jani Taskinen | Date: | Thu, 16 Jul 2009 12:18:13 +0000 |
| Subject: | svn: php/php-src/trunk/Zend/ zend_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-59505@lists.php.net to get a copy of this message | ||
jani Thu, 16 Jul 2009 12:18:13 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284187
Changed paths:
U php/php-src/trunk/Zend/zend_ini.c
Log:
CS
Modified: php/php-src/trunk/Zend/zend_ini.c
===================================================================
--- php/php-src/trunk/Zend/zend_ini.c 2009-07-16 12:16:49 UTC (rev 284186)
+++ php/php-src/trunk/Zend/zend_ini.c 2009-07-16 12:18:13 UTC (rev 284187)
@@ -47,6 +47,7 @@
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 @@
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;
}