From: Reini U. <ru...@us...> - 2007-03-19 02:01:25
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25129/lib Modified Files: CachedMarkup.php InlineParser.php Log Message: Fix :DontStoreLink Index: CachedMarkup.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/CachedMarkup.php,v retrieving revision 1.54 retrieving revision 1.55 diff -u -2 -b -p -d -r1.54 -r1.55 --- CachedMarkup.php 25 Jan 2007 07:41:41 -0000 1.54 +++ CachedMarkup.php 18 Mar 2007 17:35:14 -0000 1.55 @@ -300,4 +300,9 @@ class Cached_WikiLink extends Cached_Lin function Cached_WikiLink ($page, $label = false, $anchor = false) { $this->_page = $page; + /* ":DontStoreLink" */ + if (substr($this->_page,0,1) == ':') { + $this->_page = substr($this->_page,1); + $this->_nolink = true; + } if ($anchor) $this->_anchor = $anchor; @@ -319,7 +324,9 @@ class Cached_WikiLink extends Cached_Lin function getWikiPageLinks($basepage) { if ($basepage == '') return false; + if (isset($this->_nolink)) return false; if ($link = $this->getPagename($basepage)) return array(array('linkto' => $link, 'relation' => 0)); - else return false; + else + return false; } @@ -746,4 +753,7 @@ class Cached_PluginInvocation extends Ca // $Log$ +// Revision 1.55 2007/03/18 17:35:14 rurban +// Fix :DontStoreLink +// // Revision 1.54 2007/01/25 07:41:41 rurban // Print attribute in title. Use CSS formatting for ::= Index: InlineParser.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/InlineParser.php,v retrieving revision 1.89 retrieving revision 1.90 diff -u -2 -b -p -d -r1.89 -r1.90 --- InlineParser.php 17 Feb 2007 14:16:28 -0000 1.89 +++ InlineParser.php 18 Mar 2007 17:35:14 -0000 1.90 @@ -411,5 +411,5 @@ function LinkBracketLink($bracketlink) { /* Do not store the link */ elseif (substr($link,0,1) == ':') - return new Cached_InterwikiLink($link, $label); + return new Cached_WikiLink($link, $label); /* @@ -1071,4 +1071,7 @@ function TransformInlineNowiki($text, $m // $Log$ +// Revision 1.90 2007/03/18 17:35:14 rurban +// Fix :DontStoreLink +// // Revision 1.89 2007/02/17 14:16:28 rurban // fix color GREY to GRAY |