Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30954
Modified Files:
transform.php
Log Message:
added "!" syntax for URLs as well, i.e. !http://some.site/ does NOT create a hyperlink
Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** transform.php 2000/10/25 14:45:53 1.5
--- transform.php 2000/10/31 19:24:08 1.6
***************
*** 103,109 ****
// with Wiki words later. Wiki words in URL's break things.
! $tmpline = tokenize($tmpline, "\b($AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]", $replacements, $ntokens);
while ($oldn < $ntokens) {
! $replacements[$oldn] = LinkURL($replacements[$oldn]);
$oldn++;
}
--- 103,112 ----
// with Wiki words later. Wiki words in URL's break things.
! $tmpline = tokenize($tmpline, "!?\b($AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]", $replacements, $ntokens);
while ($oldn < $ntokens) {
! if($replacements[$oldn][0] == '!')
! $replacements[$oldn] = substr($replacements[$oldn], 1);
! else
! $replacements[$oldn] = LinkURL($replacements[$oldn]);
$oldn++;
}
|
