Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Adding Braces in json.c to conform with coding standards
This commit is contained in:
David Soria Parra committed 2012-03-20 17:29:20 +01:00
commit 71d894cd42
1 file changed
+2 -1
+2 -1
View File
@@ -174,8 +174,9 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
idx = 0;
for (;; zend_hash_move_forward_ex(myht, &pos)) {
i = zend_hash_get_current_key_ex(myht, &key, &key_len, &index, 0, &pos);
if (i == HASH_KEY_NON_EXISTANT)
if (i == HASH_KEY_NON_EXISTANT) {
break;
}
if (i == HASH_KEY_IS_STRING) {
return 1;