Merge branch 'PHP-5.5'

This commit is contained in:
Xinchen Hui committed 2013-03-31 20:08:40 +08:00
commit f4e16fe7ef
1 file changed
+1 -1
+1 -1
View File
@@ -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");
}
}
/* }}} */