Merge branch 'PHP-5.4' into PHP-5.5

weltling · weltling · commit fd5cdf89a8dd · 2013-07-16T18:05:45.000+02:00
* PHP-5.4:
  fix TS build
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
 #include "ext/mysqlnd/mysqlnd_reverse_api.h"
 static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
 {
-	if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry) TSRMLS_CC) {
+	if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry TSRMLS_CC)) {
 		MY_MYSQL * mysql;
 		MYSQLI_RESOURCE  * my_res;
 		mysqli_object * intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC);

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_`
`531`	`531`	`#include "ext/mysqlnd/mysqlnd_reverse_api.h"`
`532`	`532`	`static MYSQLND mysqli_convert_zv_to_mysqlnd(zval zv TSRMLS_DC)`
`533`	`533`	`{`
`534`		`- if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry) TSRMLS_CC) {`
	`534`	`+ if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry TSRMLS_CC)) {`
`535`	`535`	`MY_MYSQL * mysql;`
`536`	`536`	`MYSQLI_RESOURCE * my_res;`
`537`	`537`	`mysqli_object * intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC);`