From: <lra...@us...> - 2002-12-22 17:36:40
|
Update of /cvsroot/tikiwiki/tiki/lib In directory sc8-pr-cvs1:/tmp/cvs-serv23336 Modified Files: Tag: Release_Mira-bugfixes tikilib.php Log Message: Fix to consider ((page|desc)) when getting links from one page to another. Index: tikilib.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** tikilib.php 18 Dec 2002 22:05:40 -0000 1.19 --- tikilib.php 22 Dec 2002 17:36:34 -0000 1.19.2.1 *************** *** 8944,8948 **** preg_match_all("/[ \n\t\r^]([A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*)($|[ \n\t\r])/",$data,$pages); preg_match_all("/\(\(([A-Za-z0-9_\-]+)\)\)/",$data,$pages2); ! $pages = array_merge($pages[1],$pages2[1]); return $pages; } --- 8944,8949 ---- preg_match_all("/[ \n\t\r^]([A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*)($|[ \n\t\r])/",$data,$pages); preg_match_all("/\(\(([A-Za-z0-9_\-]+)\)\)/",$data,$pages2); ! preg_match_all("/\(\(([A-Za-z0-9_\-]+)\|([^\)]+)\)\)/",$data,$pages3); ! $pages = array_unique(array_merge($pages[1],$pages2[1],$pages3[1])); return $pages; } |