diff options
| author | Christopher Jones <sixd@php.net> | 2013-06-25 13:23:25 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-06-25 13:23:25 -0700 |
| commit | 5d0094e5f9f8bd49c615f2ec2542384f802d340d (patch) | |
| tree | ceabc40bbbab1cd63908d82a641b5dc35d163b7f | |
| parent | a52258ae175ea49ac03b8aea21d20c36a67c61e2 (diff) | |
| parent | 5ae1983b33cc46cb21af278162b4dfdcb2ef4d29 (diff) | |
| download | php-git-5d0094e5f9f8bd49c615f2ec2542384f802d340d.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
- BFN
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | main/main.c | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -7,6 +7,7 @@ PHP NEWS (David Soria Parra, Laruence) . Fixed bug #65088 (Generated configure script is malformed on OpenBSD). (Adam) + . Fixed bug #60732 (php_error_docref links to invalid pages). (Jakub Vrana) - CLI server: . Fixed bug #65066 (Cli server not responsive when responding with 422 http diff --git a/main/main.c b/main/main.c index c0db64d184..2821dfcdca 100644 --- a/main/main.c +++ b/main/main.c @@ -784,6 +784,9 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c /* no docref given but function is known (the default) */ if (!docref && is_function) { int doclen; + while (*function == '_') { + function++; + } if (space[0] == '\0') { doclen = spprintf(&docref_buf, 0, "function.%s", function); } else { |