[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.13,1.14

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21886/lib

Modified Files:
	stdlib.php 
Log Message:
fixed another bug in ExtractWikiPageLinks(): wiki_unknown-named was not recognized and named wiki links had the wrong linktext inserted into the wikilinks table

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** stdlib.php	2000/11/22 22:17:06	1.13
--- stdlib.php	2000/12/06 10:59:27	1.14
***************
*** 527,536 ****
        {
           $line = str_replace('[[', ' ', $content[$l]);  // remove escaped '['
! 	 $numBracketLinks = preg_match_all("/\[\s*(.+?)\s*\]/", $line, $brktlinks);
  	 for ($i = 0; $i < $numBracketLinks; $i++) {
  	    $link = ParseAndLink($brktlinks[0][$i]);
! 	    if ($link['type'] == 'wiki' || $link['type'] == 'wiki-unknown'
! 		|| $link['type'] == 'wiki-named')
! 	       $wikilinks[$brktlinks[1][$i]] = 1;
  
              $brktlink = preg_quote($brktlinks[0][$i]);
--- 527,535 ----
        {
           $line = str_replace('[[', ' ', $content[$l]);  // remove escaped '['
! 	 $numBracketLinks = preg_match_all("/\[\s*([^\]|]+\|)?\s*(.+?)\s*\]/", $line, $brktlinks);
  	 for ($i = 0; $i < $numBracketLinks; $i++) {
  	    $link = ParseAndLink($brktlinks[0][$i]);
! 	    if (preg_match("#^wiki#", $link['type']))
! 	       $wikilinks[$brktlinks[2][$i]] = 1;
  
              $brktlink = preg_quote($brktlinks[0][$i]);
***************
*** 545,549 ****
           }
        }
- 
        return $wikilinks;
     }      
--- 544,547 ----