Merge branch '0.8.0' of https://github.com/phalcon/cphalcon into 0.8.0

phalcon · Jan 9, 2013 · 1c14b4f · 1c14b4f
2 parents 48f0aab + ead8c9d
commit 1c14b4f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/build/64bits/phalcon.c b/build/64bits/phalcon.c
@@ -6550,7 +6550,7 @@ void phalcon_escape_html(zval *return_value, zval *str, zval *quote_style, zval
 		RETURN_ZVAL(str, 1, 0);
 	}
 
-	escaped = php_escape_html_entities((unsigned char*) Z_STRVAL_P(str), Z_STRLEN_P(str), (size_t *) &length, 0, Z_LVAL_P(quote_style), Z_STRVAL_P(charset) TSRMLS_CC);
+	escaped = php_escape_html_entities((unsigned char*) Z_STRVAL_P(str), Z_STRLEN_P(str), &length, 0, Z_LVAL_P(quote_style), Z_STRVAL_P(charset) TSRMLS_CC);
 	RETURN_STRINGL(escaped, length, 0);
 }
 
@@ -70252,8 +70252,8 @@ PHP_METHOD(Phalcon_Version, _getVersion){
 	add_next_index_long(version, 0);
 	add_next_index_long(version, 8);
 	add_next_index_long(version, 0);
-	add_next_index_long(version, 2);
-	add_next_index_long(version, 1);
+	add_next_index_long(version, 4);
+	add_next_index_long(version, 0);
 	RETURN_CTOR(version);
 }