Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20215/lib
Modified Files:
stdlib.php
Log Message:
fixed bug in _iftoken() - variable-in-string-brackets were used in a way that causes problems for PHP3. Fix by Jan Hidders.
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** stdlib.php 2000/12/06 10:59:27 1.14
--- stdlib.php 2000/12/06 23:12:02 1.15
***************
*** 116,120 ****
$page = str_replace($blockyesend, '', $page);
$page = preg_replace("/$blockno(.*?)$blocknoend/s", '', $page);
! $page = ereg_replace("{$lineno}[^\n]*\n", '', $page);
} else {
$page = str_replace($lineno, '', $page);
--- 116,120 ----
$page = str_replace($blockyesend, '', $page);
$page = preg_replace("/$blockno(.*?)$blocknoend/s", '', $page);
! $page = ereg_replace("${lineno}[^\n]*\n", '', $page);
} else {
$page = str_replace($lineno, '', $page);
***************
*** 122,126 ****
$page = str_replace($blocknoend, '', $page);
$page = preg_replace("/$blockyes(.*?)$blockyesend/s", '', $page);
! $page = ereg_replace("{$lineyes}[^\n]*\n", '', $page);
}
}
--- 122,126 ----
$page = str_replace($blocknoend, '', $page);
$page = preg_replace("/$blockyes(.*?)$blockyesend/s", '', $page);
! $page = ereg_replace("${lineyes}[^\n]*\n", '', $page);
}
}
|
