CVS: phpwiki/lib PageType.php,1.35,1.36 TextSearchQuery.php,1.12,1.13

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21999

Modified Files:
        PageType.php TextSearchQuery.php 
Log Message:
Optimize PearDB _extract_version_data and _extract_page_data.



Index: PageType.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/PageType.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -2 -b -p -d -r1.35 -r1.36
--- PageType.php        28 Nov 2004 19:57:56 -0000      1.35
+++ PageType.php        28 Nov 2004 20:42:18 -0000      1.36
@@ -128,6 +128,4 @@ class PageType_interwikimap extends Page
 {
     function PageType_interwikimap($pagetext = false) {
-        $intermap = false;
-
         if (!$pagetext) {
             $dbi = $GLOBALS['request']->getDbh();
@@ -139,5 +137,8 @@ class PageType_interwikimap extends Page
             } else {
                 trigger_error(_("WARNING: InterWikiMap page is unlocked, so 
not using those links."));
+                $intermap = false;
             }
+        } else {
+            $intermap = $this->_getMapFromWikiText($pagetext);
         }
         if (!$intermap && defined('INTERWIKI_MAP_FILE'))

Index: TextSearchQuery.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/TextSearchQuery.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -2 -b -p -d -r1.12 -r1.13
--- TextSearchQuery.php 27 Nov 2004 14:39:04 -0000      1.12
+++ TextSearchQuery.php 28 Nov 2004 20:42:18 -0000      1.13
@@ -12,5 +12,6 @@
  *   <dd> Match strings containing the substring 'wiki' and either the 
substring
  *        'word' or the substring 'page'.
- * <dt> detects regex hints, glob-style or regex-style, and converts them to 
PCRE or SQL matchers
+ * <dt> auto-detect regex hints, glob-style or regex-style, and converts them 
+ *      to PCRE or SQL matchers
  *   <dd> "^word$" => EXACT(word)
  *   <dd> "^word"  => STARTS_WITH(word)



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/