diff options
| author | David Soria Parra <dsp@php.net> | 2012-03-20 17:29:20 +0100 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-03-20 17:29:20 +0100 |
| commit | 71d894cd421d96517618e9d33dfea640499c8ffd (patch) | |
| tree | b0fe56c86717d7e5820f35829bc3ee75c74b5a5b /ext | |
| parent | 14ccdd1b556e5965bba9da11c584e9306f0349da (diff) | |
| parent | 76ef76d2f875ccc3c9529565bdb29451a9b087ef (diff) | |
| download | php-git-71d894cd421d96517618e9d33dfea640499c8ffd.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Adding Braces in json.c to conform with coding standards
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/json/json.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index fb0e2d8ca0..fc1fcb7f1f 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -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; |