From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 6 Mar 2014 15:31:23 +0000 (+0800)
Subject: Second argument of call_user_method is ref
X-Git-Tag: POST_PHPNG_MERGE~412^2~387
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d45dce4aa3e00f5d0bf40cc19d81033c3ce08bc;p=php

Second argument of call_user_method is ref
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 8e52a8b867..47331e3b52 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4824,6 +4824,8 @@ PHP_FUNCTION(call_user_method)
 		return;
 	}
 
+	object = Z_REFVAL_P(object);
+
 	if (Z_TYPE_P(object) != IS_OBJECT &&
 		Z_TYPE_P(object) != IS_STRING
 	) {
@@ -4856,6 +4858,8 @@ PHP_FUNCTION(call_user_method_array)
 		return;
 	}
 
+	object = Z_REFVAL_P(object);
+
 	if (Z_TYPE_P(object) != IS_OBJECT &&
 		Z_TYPE_P(object) != IS_STRING
 	) {