Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11004/lib
Modified Files:
stdlib.php transform.php
Log Message:
Bug fix: empty square brackets lead to "Fatal Database Error" and
other problems.
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** stdlib.php 2001/12/11 18:16:12 1.58
--- stdlib.php 2001/12/12 23:51:25 1.59
***************
*** 422,426 ****
// bracket links (only type wiki-* is of interest)
! $numBracketLinks = preg_match_all("/\[\s*([^\]|]+\|)?\s*(.+?)\s*\]/", $line, $brktlinks);
for ($i = 0; $i < $numBracketLinks; $i++) {
$link = ParseAndLink($brktlinks[0][$i]);
--- 422,426 ----
// bracket links (only type wiki-* is of interest)
! $numBracketLinks = preg_match_all("/\[\s*([^\]|]+\|)?\s*(\S.*?)\s*\]/", $line, $brktlinks);
for ($i = 0; $i < $numBracketLinks; $i++) {
$link = ParseAndLink($brktlinks[0][$i]);
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** transform.php 2001/12/12 23:38:53 1.29
--- transform.php 2001/12/12 23:51:25 1.30
***************
*** 437,446 ****
function wtt_bracketlinks($match, &$trfrm)
{
! $link = ParseAndLink($match);
! if (strstr($link['link'], "</form>")) {
! // FIXME: BIG HACK: see note in wtm_plugin.
! return "</p>" . $link['link'] . "<p>";
! }
! return $link["link"];
}
--- 437,450 ----
function wtt_bracketlinks($match, &$trfrm)
{
! if (preg_match('/^\[\s*\]$/', $match)) {
! return htmlspecialchars($match);
! }
!
! $link = ParseAndLink($match);
! if (strstr($link['link'], "</form>")) {
! // FIXME: BIG HACK: see note in wtm_plugin.
! return "</p>" . $link['link'] . "<p>";
! }
! return $link["link"];
}
|
