Commits

Ruslan Osmanov committed 5e55a44 Merge

Merge branch 'develop'

Comments (0)

Files changed (1)

 	ulong                        num_key;
 
 	obj = (php_event_abstract_object_t *) zend_objects_get_address(object TSRMLS_CC);
-	props = zend_std_get_properties(object TSRMLS_CC);
+	/*props = zend_std_get_properties(object TSRMLS_CC);*/
+	props = obj->zo.properties;
 
 	if (obj->prop_handler) {
 		zend_hash_internal_pointer_reset_ex(obj->prop_handler, &pos);
 /* }}} */
 #endif
 
+static HashTable *get_gc(zval *object, zval ***table, int *n TSRMLS_DC)
+{
+	*table = NULL;
+	*n = 0;
+	return zend_std_get_properties(object TSRMLS_CC);
+}
+
+
 #define PHP_EVENT_ADD_CLASS_PROPERTIES(a, b)                                           \
 {                                                                                      \
     int i = 0;                                                                         \
 #if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4
 	object_handlers.get_properties       = get_properties;
 #endif
+	object_handlers.get_gc               = get_gc;
 
 	zend_hash_init(&classes, 8, NULL, NULL, 1);
 	register_classes(TSRMLS_C);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.