Skip to content

Commit

Permalink
Merge branch 'PHP-5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
laruence committed Mar 31, 2013
2 parents 6cdf379 + 2f6b9b9 commit f4e16fe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ext/date/php_date.c
Expand Up @@ -2842,7 +2842,7 @@ PHP_METHOD(DateTime, __wakeup)
myht = Z_OBJPROP_P(object);

if (!php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC)) {
php_error(E_ERROR, "Invalid serialization data for DateTimeInterface object");
php_error(E_ERROR, "Invalid serialization data for DateTime object");
}
}
/* }}} */
Expand Down

0 comments on commit f4e16fe

Please sign in to comment.