From: Xinchen Hui <laruence@php.net>
Date: Thu, 4 Apr 2013 05:40:46 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.15RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db3d629f0578b783a48302a64a0d755942f6c574;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

db3d629f0578b783a48302a64a0d755942f6c574
diff --cc Zend/zend_execute.c
index 276ad382fb,16dc08e502..ff9c2d0de2
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -1145,8 -937,11 +1145,12 @@@ convert_to_array
  					zend_error_noreturn(E_ERROR, "[] operator not supported for strings");
  				}
  
+ 				if (type != BP_VAR_UNSET) {
+ 					SEPARATE_ZVAL_IF_NOT_REF(container_ptr);
+ 				}
+ 
  				if (Z_TYPE_P(dim) != IS_LONG) {
 +
  					switch(Z_TYPE_P(dim)) {
  						/* case IS_LONG: */
  						case IS_STRING: