Bug fix

phalcon · Jul 22, 2013 · 0575dec · 0575dec
1 parent cad2294
commit 0575dec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build/32bits/phalcon.c b/build/32bits/phalcon.c
@@ -7465,7 +7465,7 @@ static int phalcon_http_build_query(zval *return_value, zval *params, char *sep
 		smart_str formstr = { NULL, 0, 0 };
 		int res;
 
-#if PHP_VERSION_ID < 504000
+#if PHP_VERSION_ID < 50400
 		res = php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep TSRMLS_CC);
 #else
 		php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep, PHP_QUERY_RFC1738 TSRMLS_CC)

diff --git a/build/64bits/phalcon.c b/build/64bits/phalcon.c
@@ -7465,7 +7465,7 @@ static int phalcon_http_build_query(zval *return_value, zval *params, char *sep
 		smart_str formstr = { NULL, 0, 0 };
 		int res;
 
-#if PHP_VERSION_ID < 504000
+#if PHP_VERSION_ID < 50400
 		res = php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep TSRMLS_CC);
 #else
 		php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep, PHP_QUERY_RFC1738 TSRMLS_CC)

diff --git a/build/safe/phalcon.c b/build/safe/phalcon.c
@@ -7465,7 +7465,7 @@ static int phalcon_http_build_query(zval *return_value, zval *params, char *sep
 		smart_str formstr = { NULL, 0, 0 };
 		int res;
 
-#if PHP_VERSION_ID < 504000
+#if PHP_VERSION_ID < 50400
 		res = php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep TSRMLS_CC);
 #else
 		php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep, PHP_QUERY_RFC1738 TSRMLS_CC)

diff --git a/ext/kernel/string.c b/ext/kernel/string.c
@@ -34,6 +34,7 @@
 #include "ext/standard/php_http.h"
 #include "ext/standard/base64.h"
 #include "ext/standard/md5.h"
+#include "ext/standard/url.h"
 
 #ifdef PHALCON_USE_PHP_PCRE
 #include "ext/pcre/php_pcre.h"
@@ -1253,10 +1254,10 @@ int phalcon_http_build_query(zval *return_value, zval *params, char *sep TSRMLS_
 		smart_str formstr = { NULL, 0, 0 };
 		int res;
 
-#if PHP_VERSION_ID < 504000
+#if PHP_VERSION_ID < 50400
 		res = php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep TSRMLS_CC);
 #else
-		php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep, PHP_QUERY_RFC1738 TSRMLS_CC)
+		res = php_url_encode_hash_ex(HASH_OF(params), &formstr, NULL, 0, NULL, 0, NULL, 0, (Z_TYPE_P(params) == IS_OBJECT ? params : NULL), sep, PHP_QUERY_RFC1738 TSRMLS_CC);
 #endif
 
 		if (res == SUCCESS) {