Skip to content

Commit

Permalink
replace merge with replace
Browse files Browse the repository at this point in the history
  • Loading branch information
wukezhan committed Mar 8, 2016
1 parent a243e03 commit aff4973
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/air_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ PHP_METHOD(air_config, set) {
return ;
}
zval *origin_data = air_config_get_data(TSRMLS_CC);
php_array_merge(Z_ARRVAL_P(origin_data), Z_ARRVAL_P(data), 1 TSRMLS_CC);
php_array_replace_recursive(Z_ARRVAL_P(origin_data), Z_ARRVAL_P(data) TSRMLS_CC);
}
/* }}} */

Expand Down

0 comments on commit aff4973

Please sign in to comment.