com php-src: Removed error message that breaks phar: Zend/zend_execute.h
| From: | Dmitry Stogov | Date: | Mon, 12 May 2014 10:03:10 +0000 |
| Subject: | com php-src: Removed error message that breaks phar: Zend/zend_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78283@lists.php.net to get a copy of this message | ||
Commit: c6c9d1414c0bd4e6fa4a6ec6e10825fc9618cf39
Author: Dmitry Stogov <dmitry@zend.com> Mon, 12 May 2014 14:03:10 +0400
Parents: dfb10145f7c4b56c761264aac3ee52e48f09fd55
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c6c9d1414c0bd4e6fa4a6ec6e10825fc9618cf39
Log:
Removed error message that breaks phar
Changed paths:
M Zend/zend_execute.h
Diff:
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 52689d2..0007e98 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -115,7 +115,8 @@ again:
break;
}
- zend_error(E_RECOVERABLE_ERROR, "Object of class %s could not be converted to
boolean", Z_OBJ_P(op)->ce->name->val);
+ // TODO: The following line breakes phar ???
+ // zend_error(E_RECOVERABLE_ERROR, "Object of class %s could not be converted to
boolean", Z_OBJ_P(op)->ce->name->val);
} else if (Z_OBJ_HT_P(op)->get) {
zval rv;
zval *tmp = Z_OBJ_HT_P(op)->get(op, &rv TSRMLS_CC);