- Fix for bug #30367, #30490 and possibly #30011.

diff --git a/NEWS b/NEWS
index 739fc1ed2f45d1c45c7d75595a50eafb01a00ad1..8bee5bd775d3224af7deb16b08419ee34ce49bb5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,10 @@ PHP                                                                        NEWS
 - Fixed bug #30658 (Ensure that temporary files created by GD are removed).
   (Ilia)
 - Fixed bug #30645 (def. multi result set support for mysql_connect). (Georg)
+- Fixed bug #30637 (compile with pear error). (Antony)
 - Fixed bug #30572 (crash when comparing SimpleXML attribute to a boolean).
   (Andi)
+- Fixed bug #30490 (PEAR installation fails). (Antony)
 - Fixed bug #30475 (curl_getinfo() may crash in some situations). (Ilia)
 - Fixed bug #30442 (segfault when parsing ?getvariable[][ ). (Tony)
 - Fixed bug #30388 (rename across filesystems loses ownership and 

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index f150479c71cf2a59530a92234f78cde246641523..5a8f380de858616827a731262ff6019c847a2132 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -685,7 +685,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                                zend_error(E_ERROR, "Object does not support method calls");
                        }
                        EX(function_state).function = 
-                         Z_OBJ_HT_PP(fci->object_pp)->get_method(*fci->object_pp, Z_STRVAL_P(fci->function_name), Z_STRLEN_P(fci->function_name) TSRMLS_CC);
+                               Z_OBJ_HT_PP(fci->object_pp)->get_method(fci->object_pp, Z_STRVAL_P(fci->function_name), Z_STRLEN_P(fci->function_name) TSRMLS_CC);
                } else if (calling_scope) {
                        char *function_name_lc = zend_str_tolower_dup(Z_STRVAL_P(fci->function_name), Z_STRLEN_P(fci->function_name));