cvs: ZendEngine2 / zend_API.c
| From: | Marcus Boerger | Date: | Wed, 06 Feb 2008 22:00:21 +0000 |
| Subject: | cvs: ZendEngine2 / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-6370@lists.php.net to get a copy of this message | ||
helly Wed Feb 6 22:00:21 2008 UTC
Modified files:
/ZendEngine2 zend_API.c
Log:
- Is there an easier way to figure out something is a string?
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.460&r2=1.461&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.460 ZendEngine2/zend_API.c:1.461
--- ZendEngine2/zend_API.c:1.460 Wed Feb 6 21:53:17 2008
+++ ZendEngine2/zend_API.c Wed Feb 6 22:00:21 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.460 2008/02/06 21:53:17 helly Exp $ */
+/* $Id: zend_API.c,v 1.461 2008/02/06 22:00:21 helly Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -3016,7 +3016,7 @@
if (ce) {
return zend_is_callable_check_func(check_flags, zobj_ptr_ptr, ce, *method, ce_ptr, fptr_ptr,
error TSRMLS_CC);
} else {
- if (error) zend_spprintf(error, 0, "first array member is not a valid %s",
Z_TYPE_PP(obj) == IS_STRING ? "class name" : "object");
+ if (error) zend_spprintf(error, 0, "first array member is not a valid %s",
(Z_TYPE_PP(obj) == IS_STRING || Z_TYPE_PP(obj) == IS_UNICODE) ? "class name" :
"object");
}
} else {
if (zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) {