Merge branch 'PHP-5.6'

This commit is contained in:
Derick Rethans 2014-02-11 11:31:13 +00:00
commit c4e6c12b71

View File

@ -3638,7 +3638,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRML
efree(dummy_t);
return FAILURE;
} else {
set_timezone_from_timelib_time(tzobj, dummy_t TSRMLS_CC);
set_timezone_from_timelib_time(tzobj, dummy_t);
efree(dummy_t);
return SUCCESS;
}