tony2001                Wed Apr 12 12:52:00 2006 UTC

  Modified files:              
    /php-src/main       main.c 
  Log:
  MF51: fix #37053 (html_errors with internal classes produces wrong links)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.685&r2=1.686&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.685 php-src/main/main.c:1.686
--- php-src/main/main.c:1.685   Fri Apr  7 11:43:43 2006
+++ php-src/main/main.c Wed Apr 12 12:52:00 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.685 2006/04/07 11:43:43 dmitry Exp $ */
+/* $Id: main.c,v 1.686 2006/04/12 12:52:00 tony2001 Exp $ */
 
 /* {{{ includes
  */
@@ -608,10 +608,18 @@
 
        /* no docref given but function is known (the default) */
        if (!docref && function.v) {
-               if (function_name_is_string) {
-                       spprintf(&docref_buf, 0, "function.%s", function.s);
+               if (space[0] == '\0') {
+                       if (function_name_is_string) {
+                               spprintf(&docref_buf, 0, "function.%s", 
function.s);
+                       } else {
+                               spprintf(&docref_buf, 0, "function.%v", 
function);
+                       }
                } else {
-                       spprintf(&docref_buf, 0, "function.%v", function);
+                       if (function_name_is_string) {
+                               spprintf(&docref_buf, 0, "function.%v-%s", 
class_name, function.s);
+                       } else {
+                               spprintf(&docref_buf, 0, "function.%v-%v", 
class_name, function);
+                       }
                }
                while((p = strchr(docref_buf, '_')) != NULL) {
                        *p = '-';

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to