--- embedaddon/php/Zend/zend_execute.c	2012/05/29 12:34:35	1.1.1.2
+++ embedaddon/php/Zend/zend_execute.c	2013/07/22 01:32:15	1.1.1.3
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.c,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */
+/* $Id: zend_execute.c,v 1.1.1.3 2013/07/22 01:32:15 misho Exp $ */
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
@@ -554,11 +554,10 @@ static inline void make_real_object(zval **object_ptr 
 		|| (Z_TYPE_PP(object_ptr) == IS_BOOL && Z_LVAL_PP(object_ptr) == 0)
 		|| (Z_TYPE_PP(object_ptr) == IS_STRING && Z_STRLEN_PP(object_ptr) == 0)
 	) {
-		zend_error(E_WARNING, "Creating default object from empty value");
-
 		SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
 		zval_dtor(*object_ptr);
 		object_init(*object_ptr);
+		zend_error(E_WARNING, "Creating default object from empty value");
 	}
 }
 
@@ -1146,6 +1145,10 @@ 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)) {
@@ -1162,7 +1165,7 @@ convert_to_array:
 						case IS_DOUBLE:
 						case IS_NULL:
 						case IS_BOOL:
-							zend_error(E_NOTICE, "String offset cast occured");
+							zend_error(E_NOTICE, "String offset cast occurred");
 							break;
 						default:
 							zend_error(E_WARNING, "Illegal offset type");
@@ -1174,9 +1177,6 @@ convert_to_array:
 					convert_to_long(&tmp);
 					dim = &tmp;
 				}
-				if (type != BP_VAR_UNSET) {
-					SEPARATE_ZVAL_IF_NOT_REF(container_ptr);
-				}
 				container = *container_ptr;
 				result->str_offset.str = container;
 				PZVAL_LOCK(container);
@@ -1285,7 +1285,7 @@ static void zend_fetch_dimension_address_read(temp_var
 						case IS_NULL:
 						case IS_BOOL:
 							if (type != BP_VAR_IS) {
-								zend_error(E_NOTICE, "String offset cast occured");
+								zend_error(E_NOTICE, "String offset cast occurred");
 							}
 							break;
 						default: