Patch swish-0.4.0-php54x.diff for swish Bug #61959
Patch version 2012-05-06 09:04 UTC
Return to Bug #61959 |
Download this patch
Patch Revisions:
Developer: oeriksson@mandriva.com
--- swish.c 2009-10-05 09:27:34.000000000 +0200
+++ swish.c.oden 2012-05-06 10:52:52.272422632 +0200
@@ -340,7 +340,7 @@ static void php_sw_results_indexes_to_ar
}
/* }}} */
-static zval *php_sw_results_read_property(zval *object, zval *member, int type TSRMLS_DC) /* {{{ */
+static zval *php_sw_results_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) /* {{{ */
{
struct php_sw_results *r;
zval tmp_member;
@@ -365,7 +365,7 @@ static zval *php_sw_results_read_propert
Z_SET_REFCOUNT_P(retval, 0);
} else {
std_hnd = zend_get_std_object_handlers();
- retval = std_hnd->read_property(object, member, type TSRMLS_CC);
+ retval = std_hnd->read_property(object, member, type, key TSRMLS_CC);
}
if (member == &tmp_member) {
@@ -428,7 +428,7 @@ static void php_sw_prop_to_zval(struct p
}
/* }}} */
-static zval *php_sw_result_read_property(zval *object, zval *member, int type TSRMLS_DC) /* {{{ */
+static zval *php_sw_result_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) /* {{{ */
{
struct php_sw_result *r;
zval tmp_member;
@@ -450,7 +450,7 @@ static zval *php_sw_result_read_property
/* not found */
zval_ptr_dtor(&retval);
std_hnd = zend_get_std_object_handlers();
- retval = std_hnd->read_property(object, member, type TSRMLS_CC);
+ retval = std_hnd->read_property(object, member, type, key TSRMLS_CC);
} else {
Z_SET_REFCOUNT_P(retval, 0);
}
@@ -525,7 +525,7 @@ static void php_sw_handle_indexes_to_arr
}
/* }}} */
-static zval *php_sw_handle_read_property(zval *object, zval *member, int type TSRMLS_DC) /* {{{ */
+static zval *php_sw_handle_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) /* {{{ */
{
struct php_sw_handle *h;
zval tmp_member;
@@ -546,7 +546,7 @@ static zval *php_sw_handle_read_property
Z_SET_REFCOUNT_P(retval, 0);
} else {
std_hnd = zend_get_std_object_handlers();
- retval = std_hnd->read_property(object, member, type TSRMLS_CC);
+ retval = std_hnd->read_property(object, member, type, key TSRMLS_CC);
}
if (member == &tmp_member) {
|