Merge branch '1.2.1'

phalcon · Jul 23, 2013 · ea95b05 · ea95b05
2 parents d1fd62d + 2a3dcb9
commit ea95b05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ext/assets/manager.c b/ext/assets/manager.c
@@ -625,7 +625,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output){
 		 * If the collection must not be joined we must print a HTML for each one
 		 */
 		if (Z_TYPE_P(filters) == IS_ARRAY) { 
-			if (!zend_is_true(join)) {
+			if (zend_is_true(join)) {
 				if (zend_is_true(local)) {
 
 					/** 

diff --git a/ext/http/cookie.c b/ext/http/cookie.c
@@ -422,12 +422,12 @@ PHP_METHOD(Phalcon_Http_Cookie, send){
 	php_setcookie(
 		Z_STRVAL_P(name), Z_STRLEN_P(name),
 		Z_STRVAL_P(encrypt_value), Z_STRLEN_P(encrypt_value),
-		Z_DVAL_P(expire),
+		Z_LVAL_P(expire),
 		Z_STRVAL_P(path), Z_STRLEN_P(path),
 		Z_STRVAL_P(domain), Z_STRLEN_P(domain),
-		Z_DVAL_P(secure),
+		Z_LVAL_P(secure),
 		1,
-		Z_DVAL_P(http_only) TSRMLS_CC
+		Z_LVAL_P(http_only) TSRMLS_CC
 	);
 
 	RETURN_THIS();
@@ -561,9 +561,9 @@ PHP_METHOD(Phalcon_Http_Cookie, delete){
 		time(NULL) - 691200,
 		Z_STRVAL_P(path), Z_STRLEN_P(path),
 		Z_STRVAL_P(domain), Z_STRLEN_P(domain),
-		Z_DVAL_P(secure),
+		Z_LVAL_P(secure),
 		1,
-		Z_DVAL_P(http_only) TSRMLS_CC
+		Z_LVAL_P(http_only) TSRMLS_CC
 	);
 
 	PHALCON_MM_RESTORE();