cvs: pearweb / package.php package.xml /include pear-format-html.php

mj Sat Feb 24 15:38:11 2007 UTC Modified files: /pearweb package.xml package.php /pearweb/include pear-format-html.php Log: * Extended the regular expressions in make_ticket_links() to accept more patterns. Bug #9127. # No unit test for this because pear-format-html.php can't be tested # without basically loading the whole website inside the unit test. Grrr. http://cvs.php.net/viewvc.cgi/pearweb/package.xml?r1=1.136&r2=1.137&diff_format=u Index: pearweb/package.xml diff -u pearweb/package.xml:1.136 pearweb/package.xml:1.137 --- pearweb/package.xml:1.136 Sat Feb 24 00:49:12 2007 +++ pearweb/package.xml Sat Feb 24 15:38:11 2007 @@ -66,6 +66,7 @@ <notes> * hide bug/feature detail by default in roadmap * re-order PHP versions so that 5.x is first, remove old CVS tags, add HEAD +* Fixed bug #9127. </notes> <contents> <dir baseinstalldir="/" name="/"> http://cvs.php.net/viewvc.cgi/pearweb/package.php?r1=1.100&r2=1.101&diff_format=u Index: pearweb/package.php diff -u pearweb/package.php:1.100 pearweb/package.php:1.101 --- pearweb/package.php:1.100 Sat Feb 24 00:49:12 2007 +++ pearweb/package.php Sat Feb 24 15:38:11 2007 @@ -21,6 +21,7 @@ $a->setNotes(' * hide bug/feature detail by default in roadmap * re-order PHP versions so that 5.x is first, remove old CVS tags, add HEAD +* Fixed bug #9127 '); $a->resetUsesrole(); $a->addUsesRole('web', 'Role_Web', 'pearified.com'); http://cvs.php.net/viewvc.cgi/pearweb/include/pear-format-html.php?r1=1.196&r2=1.197&diff_format=u Index: pearweb/include/pear-format-html.php diff -u pearweb/include/pear-format-html.php:1.196 pearweb/include/pear-format-html.php:1.197 --- pearweb/include/pear-format-html.php:1.196 Tue Feb 6 18:43:49 2007 +++ pearweb/include/pear-format-html.php Sat Feb 24 15:38:11 2007 @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ | Authors: | +----------------------------------------------------------------------+ - $Id: pear-format-html.php,v 1.196 2007/02/06 18:43:49 cellog Exp $ + $Id: pear-format-html.php,v 1.197 2007/02/24 15:38:11 mj Exp $ */ PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'error_handler'); @@ -1150,10 +1150,10 @@ */ function make_ticket_links($text) { - $text = preg_replace('/(?<=php)\s*(bug|request)\s+#?([0-9]+)/i', + $text = preg_replace('/(?<=php)\s*(bug(?:fix)?|req(?:uest)?)\s+#?([0-9]+)/i', ' <a href="http://bugs.php.net/\\2">\\1 \\2</a>', $text); - $text = preg_replace('/(?<![>a-z])(bug|request)\s+#?([0-9]+)/i', + $text = preg_replace('/(?<![>a-z])(bug(?:fix)?|req(?:uest)?)\s+#?([0-9]+)/i', '<a href="/bugs/\\2">\\0</a>', $text); return $text; }