MFH: Patch by Joe Orton <jorton@redhat.com>.

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index acb447ccdf4a604eca28a3dcc7f014671be06e23..5db74fa56fe9ac7c6cd1364420bcc78f0e902b84 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1375,7 +1375,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, zend_function_entr
                }
                while (ptr->fname) {
                        if (zend_hash_exists(target_function_table, ptr->fname, strlen(ptr->fname)+1)) {
-                               zend_error(error_type, "Function registration failed - duplicate name - %s", ptr->fname);
+                               zend_error(error_type, "Function registration failed - duplicate name - %s%s%s", scope ? scope->name : "", scope ? "::" : "", ptr->fname);
                        }
                        ptr++;
                }