summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2016-05-17 18:07:36 +0800
committerXinchen Hui <laruence@gmail.com>2016-05-17 18:07:36 +0800
commit0c8879e3da507664eeb49ee00df91184a809428f (patch)
treecd13e4ddb5d8afaf4a3aebd3f6ddd69877f1ecba
parentb27ecb50269123885d9de3d76a511d414f4ccb0b (diff)
parent2eb7e75c25e3b16c3265e6a53f57a29dbeec0d2f (diff)
downloadphp-git-0c8879e3da507664eeb49ee00df91184a809428f.tar.gz
Merge branch 'PHP-7.0'
* PHP-7.0: Let's only read-only here
-rw-r--r--ext/standard/var.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 08806f9698..16b9fffba1 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -958,7 +958,7 @@ again:
}
if (Z_ISREF_P(data) && Z_REFCOUNT_P(data) == 1) {
- ZVAL_UNREF(data);
+ data = Z_REFVAL_P(data);
}
/* we should still add element even if it's not OK,