CVS update: /cowiki/includes/cowiki/class/parse/

User: cmarble 
Date: 2005/07/27 15:22:41

Modified:
   cowiki/includes/cowiki/class/parse/class.WikiParser.php
   cowiki/includes/cowiki/class/parse/class.CoWikiParser.php

Log:
 To honour the RUNTIME_WIKIWORDS configuration, stepping carefully around inherited nullness. How appropriate.

File Changes:

Directory: /cowiki/includes/cowiki/class/parse/
===============================================

File [changed]: class.WikiParser.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/parse/class.WikiParser.php?r1=1.58&r2=1.59
Delta lines:  +6 -3
-------------------
--- class.WikiParser.php	27 Jul 2005 20:11:09 -0000	1.58
+++ class.WikiParser.php	27 Jul 2005 22:22:39 -0000	1.59
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.WikiParser.php,v 1.58 2005/07/27 20:11:09 cmarble Exp $
+ * $Id: class.WikiParser.php,v 1.59 2005/07/27 22:22:39 cmarble Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -21,7 +21,7 @@
  * @author      Daniel T. Gorski, <[email protected]>
  * @copyright   (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license     http://www.gnu.org/licenses/gpl.html
- * @version     $Revision: 1.58 $
+ * @version     $Revision: 1.59 $
  *
  */
 
@@ -52,6 +52,7 @@
         $bList = false,
         $bTable = false;
     protected $RefNodes = null;
+    protected $Registry = null;
     // --------------------------------------------------------------------
 
     /**
@@ -494,7 +495,9 @@
               if($debug){echo "10.6\n";}
                 $sRet .= $aMatches[0];
             //WikiWords
-            }else if( preg_match( '=^([A-Z][a-z]+([A-Z][a-z]+)+)=s',
+            }else if((($Registry != null && $Registry->get('RUNTIME_WIKIWORDS'))
+                      || $Registry == null)
+                        && preg_match( '=^([A-Z][a-z]+([A-Z][a-z]+)+)=s',
                                     $sStr, $aMatches )) {
                 $sLink = ltrim(preg_replace( '=([A-Z])=', ' \1',
                                                 $aMatches[1] ));

File [changed]: class.CoWikiParser.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/parse/class.CoWikiParser.php?r1=1.17&r2=1.18
Delta lines:  +5 -3
-------------------
--- class.CoWikiParser.php	22 Jun 2005 16:04:26 -0000	1.17
+++ class.CoWikiParser.php	27 Jul 2005 22:22:39 -0000	1.18
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.CoWikiParser.php,v 1.17 2005/06/22 16:04:26 cmarble Exp $
+ * $Id: class.CoWikiParser.php,v 1.18 2005/07/27 22:22:39 cmarble Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -17,7 +17,7 @@
  * @author      Daniel T. Gorski, <[email protected]>
  * @copyright   (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license     http://www.gnu.org/licenses/gpl.html
- * @version     $Revision: 1.17 $
+ * @version     $Revision: 1.18 $
  *
  */
 
@@ -55,7 +55,9 @@
         return self::$Instance;
     }
 
-    protected function __construct() {}
+    protected function __construct() {
+        $Registry = Registry::getInstance();
+    }
 
     // --- Element creators -----------------------------------------------