[Tikiwiki-cvs] tiki tiki-setup.php,1.28,1.29

[<gil...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1:/tmp/cvs-serv22703

Modified Files:
	tiki-setup.php 
Log Message:
Fixed full page_regex and made sure strict and full are compatible for use in ((x|desc)) - desc is [5].

Index: tiki-setup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-setup.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tiki-setup.php	6 Jan 2003 03:45:48 -0000	1.28
+++ tiki-setup.php	6 Jan 2003 16:02:16 -0000	1.29
@@ -417,10 +417,12 @@
 
 $wiki_page_regex = $tikilib->get_preference('wiki_page_regex','strict');
 $smarty->assign('wiki_page_regex',$wiki_page_regex);
+// Please DO NOT modify any of the brackets in the regex(s).
+// It may seem redundent but, really, they are ALL REQUIRED.
 if($wiki_page_regex == 'strict') {
-  $page_regex = '[A-Za-z0-9_][\.: A-Za-z0-9_\-]*[A-Za-z0-9_]';	
+  $page_regex = '([A-Za-z0-9_])([\.: A-Za-z0-9_\-])*([A-Za-z0-9_])';	
 } else {
-  $page_regex = '[A-Za-z0-9_\x80-\xFF][\.: A-Za-z0-9_\-\x80-\xFF]*[A-Za-z0-9_\x80-\xFF]';	
+  $page_regex = '([A-Za-z0-9_]|[\x80-\xFF])([\.: A-Za-z0-9_\-]|[\x80-\xFF])*([A-Za-z0-9_]|[\x80-\xFF])';	
 }