Merge pull request #1603 from sjinks/1.2.5

Fix compilation errors in zim_Phalcon_Mvc_Model_Row_toArray()

Author: Phalcon

ext/mvc/model/row.c

@@ -149,31 +149,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, offsetUnset){
  */
 PHP_METHOD(Phalcon_Mvc_Model_Row, toArray){
 
-	zval *properties, *key = NULL, *value = NULL;
-	HashTable *ah0;
-	HashPosition hp0;
-	zval **hd;
+	HashTable *properties;
 
-	PHALCON_MM_GROW();
-	
 	properties = Z_OBJ_HT_P(this_ptr)->get_properties(this_ptr TSRMLS_CC);
 
-	if (properties == NULL) {
-		RETURN_MM_FALSE;
-	}
-
-	array_init(return_value);
-
-	zend_hash_internal_pointer_reset_ex(properties, &hp0);
-	while (zend_hash_get_current_data_ex(properties, (void**) &hd, &hp0) == SUCCESS) {
-		PHALCON_GET_HKEY(key, ah0, hp0);
-		PHALCON_GET_HVALUE(value);
-
-		phalcon_array_update_zval(&return_value, key, &value, PH_COPY | PH_SEPARATE);
-
-		zend_hash_move_forward_ex(ah0, &hp0);
+	if (!properties) {
+		RETURN_FALSE;
 	}
 
-	RETURN_MM();
+	array_init_size(return_value, zend_hash_num_elements(properties));
+	zend_hash_copy(Z_ARRVAL_P(return_value), properties, (copy_ctor_func_t)zval_add_ref, NULL, sizeof(zval*));
 }
-