From 85a992176475155e72b369ef312220caf2880e69 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 12 May 2004 19:27:48 +0000
Subject: [PATCH] revert wrong inline optimization.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3477 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/InlineParser.php |  8 +++++---
 lib/WikiDB.php       | 11 +++++++++--
 lib/prepend.php      |  4 ++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/InlineParser.php b/lib/InlineParser.php
index 7b31e28a2..f6cba72ba 100644
--- a/lib/InlineParser.php
+++ b/lib/InlineParser.php
@@ -1,5 +1,5 @@
 <?php 
-rcs_id('$Id: InlineParser.php,v 1.50 2004-05-12 10:49:54 rurban Exp $');
+rcs_id('$Id: InlineParser.php,v 1.51 2004-05-12 19:27:47 rurban Exp $');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki@dairiki.org>
  * Copyright (C) 2004 Reini Urban
  *
@@ -89,6 +89,7 @@ class RegexpSet
     function RegexpSet ($regexps) {
         assert($regexps);
         $this->_regexps = array_unique($regexps);
+        if (!defined('_INLINE_OPTIMIZATION')) define('_INLINE_OPTIMIZATION',0);
     }
 
     /**
@@ -143,7 +144,7 @@ class RegexpSet
         // If one of the regexps is an empty string, php will crash here: 
         // sf.net: Fatal error: Allowed memory size of 8388608 bytes exhausted 
         //         (tried to allocate 634 bytes)
-
+        if (_INLINE_OPTIMIZATION) {
         // So we try to minize memory usage, by looping explicitly,
         // and storing only those regexp which actually match. 
         // There may be more than one, so we have to find the longest, 
@@ -165,6 +166,7 @@ class RegexpSet
         // To overcome ANCHORED:
         // We could sort by longest match and iterate over these.
         if (empty($matched)) return false;
+        }
         $match = new RegexpSet_match;
         
         // Optimization: if the matches are only "$" and another, then omit "$"
@@ -173,7 +175,7 @@ class RegexpSet
         //   s - DOTALL
         //   A - ANCHORED
         //   S - STUDY
-        if (count($matched) > 2) {
+        if (! _INLINE_OPTIMIZATION or count($matched) > 2) {
             // We could do much better, if we would know the matching markup for the 
             // longest regexp match:
             $hugepat= "/ ( . $repeat ) ( (" . join(')|(', $regexps) . ") ) /Asx";
diff --git a/lib/WikiDB.php b/lib/WikiDB.php
index bb788ca94..5b09d2b4e 100644
--- a/lib/WikiDB.php
+++ b/lib/WikiDB.php
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: WikiDB.php,v 1.54 2004-05-12 10:49:55 rurban Exp $');
+rcs_id('$Id: WikiDB.php,v 1.55 2004-05-12 19:27:47 rurban Exp $');
 
 //require_once('lib/stdlib.php');
 require_once('lib/PageType.php');
@@ -1694,7 +1694,7 @@ class WikiDB_cache
     
     function get_versiondata($pagename, $version, $need_content = false) {
         //  FIXME: Seriously ugly hackage
-	if (defined ('USECACHE')){   //temporary - for debugging
+	if (defined('USECACHE') and USECACHE) {   //temporary - for debugging
             assert(is_string($pagename) && $pagename != '');
             // there is a bug here somewhere which results in an assertion failure at line 105
             // of ArchiveCleaner.php  It goes away if we use the next line.
@@ -1765,6 +1765,13 @@ class WikiDB_cache
 };
 
 // $Log: not supported by cvs2svn $
+// Revision 1.54  2004/05/12 10:49:55  rurban
+// require_once fix for those libs which are loaded before FileFinder and
+//   its automatic include_path fix, and where require_once doesn't grok
+//   dirname(__FILE__) != './lib'
+// upgrade fix with PearDB
+// navbar.tmpl: remove spaces for IE &nbsp; button alignment
+//
 // Revision 1.53  2004/05/08 14:06:12  rurban
 // new support for inlined image attributes: [image.jpg size=50x30 align=right]
 // minor stability and portability fixes
diff --git a/lib/prepend.php b/lib/prepend.php
index 8a70944ac..b999ba9b5 100644
--- a/lib/prepend.php
+++ b/lib/prepend.php
@@ -5,9 +5,9 @@
  */
 $RCS_IDS = '';
 function rcs_id ($id) { $GLOBALS['RCS_IDS'] .= "$id\n"; }
-rcs_id('$Id: prepend.php,v 1.18 2004-04-26 12:22:56 rurban Exp $');
+rcs_id('$Id: prepend.php,v 1.19 2004-05-12 19:27:48 rurban Exp $');
 
-define ('PHPWIKI_VERSION', '1.3.10pre');
+define ('PHPWIKI_VERSION', '1.3.10');
 
 // If your php was compiled with --enable-trans-sid it tries to
 // add a PHPSESSID query argument to all URL strings when cookie
-- 
2.45.0