tony2001 Wed Apr 12 12:49:39 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/main main.c
Log:
fix #37053 (html_errors with internal classes produces wrong links)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.506&r2=1.2027.2.507&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.506 php-src/NEWS:1.2027.2.507
--- php-src/NEWS:1.2027.2.506 Wed Apr 12 11:37:49 2006
+++ php-src/NEWS Wed Apr 12 12:49:39 2006
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Apr 2006, PHP 5.1.3
+- Fixed bug #37053 (html_errors with internal classes produces wrong links).
+ (Tony)
- Fixed bug #37046 (foreach breaks static scope). (Dmitry)
- Fixed bug #37002 (Have to quote literals in INI when concatenating with
vars). (Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.22&r2=1.640.2.23&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.22 php-src/main/main.c:1.640.2.23
--- php-src/main/main.c:1.640.2.22 Fri Apr 7 11:44:03 2006
+++ php-src/main/main.c Wed Apr 12 12:49:39 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.22 2006/04/07 11:44:03 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23 2006/04/12 12:49:39 tony2001 Exp $ */
/* {{{ includes
*/
@@ -509,7 +509,11 @@
/* no docref given but function is known (the default) */
if (!docref && is_function) {
- spprintf(&docref_buf, 0, "function.%s", function);
+ if (space[0] == '\0') {
+ spprintf(&docref_buf, 0, "function.%s", function);
+ } else {
+ spprintf(&docref_buf, 0, "function.%s-%s", 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
