[Tikiwiki-cvs] tiki/lib tikilib.php,1.196.2.5,1.196.2.6

[<oh...@us...>]

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

Modified Files:
      Tag: release_eta_carinea_rc1
	tikilib.php 
Log Message:
feature_wikiwords: Usage of WikiWords can be switched on/off,
closed RFE [ 750114 ]: Don't generate wiki reference for hyphenated words

Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.196.2.5
retrieving revision 1.196.2.6
diff -u -d -r1.196.2.5 -r1.196.2.6
--- tikilib.php	20 Jul 2003 20:39:36 -0000	1.196.2.5
+++ tikilib.php	21 Jul 2003 22:00:37 -0000	1.196.2.6
@@ -2816,6 +2816,7 @@
     global $feature_wiki_pictures;
     global $tiki_p_upload_picture;
     global $feature_wiki_tables;
+    global $feature_wikiwords;
     global $page; 
     global $rsslib;
     global $dbTiki;
@@ -3052,18 +3053,20 @@
     // If they are parenthesized then don't treat as links
     // Prevent ))PageName(( from being expanded    \"\'
     //[A-Z][a-z0-9_\-]+[A-Z][a-z0-9_\-]+[A-Za-z0-9\-_]*
-    // The first part is now mandatory to prevent [Foo|MyPage] from being converted!
-    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);
-    foreach(array_unique($pages[2]) as $page_parse) {
-      if($desc = $this->page_exists_desc($page_parse)) {
-        $repl = '<a title="'.$desc.'" href="tiki-index.php?page='.urlencode($page_parse).'" class="wiki">'.$page_parse.'</a>';
-      } else {
-        $repl = "$page_parse<a href='tiki-editpage.php?page=".urlencode($page_parse)."' class='wiki'>?</a>";
-      }
-      $data = preg_replace("/([ \n\t\r\,\;]|^)$page_parse($|[ \n\t\r\,\;\.])/","$1"."$repl"."$2",$data);
-      //$data = str_replace($page_parse,$repl,$data);
-    }
 
+    if($feature_wikiwords == 'y') {
+	    // The first part is now mandatory to prevent [Foo|MyPage] from being converted!
+	    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);
+	    foreach(array_unique($pages[2]) as $page_parse) {
+	      if($desc = $this->page_exists_desc($page_parse)) {
+	        $repl = '<a title="'.$desc.'" href="tiki-index.php?page='.urlencode($page_parse).'" class="wiki">'.$page_parse.'</a>';
+	      } else {
+	        $repl = "$page_parse<a href='tiki-editpage.php?page=".urlencode($page_parse)."' class='wiki'>?</a>";
+	      }
+	      $data = preg_replace("/([ \n\t\r\,\;]|^)$page_parse($|[ \n\t\r\,\;\.])/","$1"."$repl"."$2",$data);
+	      //$data = str_replace($page_parse,$repl,$data);
+	    }
+    }
 
     $data = preg_replace("/([ \n\t\r\,\;]|^)\)\)([^\(]+)\(\(($|[ \n\t\r\,\;\.])/","$1"."$2"."$3",$data);
     // New syntax for wiki pages ((name|desc)) Where desc can be anything
@@ -3559,10 +3562,17 @@
 
   function get_pages($data) {
     global $page_regex;
-    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("/\(\(($page_regex)\)\)/",$data,$pages2);
-    preg_match_all("/\(\(($page_regex)\|(.+?)\)\)/",$data,$pages3);
-    $pages = array_unique(array_merge($pages[2],$pages2[1],$pages3[1]));
+
+    if($feature_wikiwords == 'y') {
+	    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("/\(\(($page_regex)\)\)/",$data,$pages2);
+	    preg_match_all("/\(\(($page_regex)\|(.+?)\)\)/",$data,$pages3);
+	    $pages = array_unique(array_merge($pages[2],$pages2[1],$pages3[1]));
+    } else {
+	    preg_match_all("/\(\(($page_regex)\)\)/",$data,$pages);
+	    preg_match_all("/\(\(($page_regex)\|(.+?)\)\)/",$data,$pages2);
+	    $pages = array_unique(array_merge($pages[1],$pages2[1]));
+    }
     return $pages;
   }