cvs: php-src /main main.c

From: Date: Tue, 02 Sep 2003 00:35:52 +0000
Subject: cvs: php-src /main main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-23557@lists.php.net to get a copy of this message
helly Mon Sep 1 20:35:52 2003 EDT Modified files: /php-src/main main.c Log: Error message clean up part III: Fix ini setting logic & respect docref_root Index: php-src/main/main.c diff -u php-src/main/main.c:1.573 php-src/main/main.c:1.574 --- php-src/main/main.c:1.573 Mon Sep 1 19:32:28 2003 +++ php-src/main/main.c Mon Sep 1 20:35:51 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.573 2003/09/01 23:32:28 helly Exp $ */ +/* $Id: main.c,v 1.574 2003/09/02 00:35:51 helly Exp $ */ /* {{{ includes */ @@ -487,7 +487,7 @@ } } } - if (docref) { + if (docref && (PG(html_errors) || strlen(PG(docref_root)))) { if (strncmp(docref, "http://", 7)) { docref_root = PG(docref_root); /* now check copy of extension */ @@ -515,10 +515,7 @@ } } } - if (!PG(html_errors) || !strlen(PG(docref_root))) { - /* no docref and no html errors -> do not point to any documentation (e.g. production boxes) */ - spprintf(&message, 0, "%s: %s", origin, buffer); - } else if (PG(html_errors)) { + if (PG(html_errors)) { spprintf(&message, 0, "%s [<a href='%s%s%s'>%s</a>]: %s", origin, docref_root, docref, docref_target, docref, buffer); } else { spprintf(&message, 0, "%s [%s%s%s]: %s", origin, docref_root, docref, docref_target, buffer);

« previous php.cvs (#23557) next »