From 287b36616a6980023577c08f4d377eaafacf82a2 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Wed, 22 Jun 2005 05:27:40 +0000
Subject: [PATCH] add ENABLE_MARKUP_COLOR

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4719 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 config/config-default.ini | 3 ++-
 config/config-dist.ini    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/config-default.ini b/config/config-default.ini
index 5d77f5b2c..2a2a8e2dd 100644
--- a/config/config-default.ini
+++ b/config/config-default.ini
@@ -1,4 +1,4 @@
-; $Id: config-default.ini,v 1.33 2005-06-05 05:34:58 rurban Exp $
+; $Id: config-default.ini,v 1.34 2005-06-22 05:27:40 rurban Exp $
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 
 ; recent development and debugging features:
@@ -18,6 +18,7 @@ GOOGLE_LINKS_NOFOLLOW = true
 USE_SAFE_DBSESSION = false
 ENABLE_DISCUSSION_LINK = false
 ENABLE_CAPTCHA = false
+ENABLE_MARKUP_COLOR = true
 
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true
diff --git a/config/config-dist.ini b/config/config-dist.ini
index e7d39a83d..1cfed4110 100644
--- a/config/config-dist.ini
+++ b/config/config-dist.ini
@@ -881,6 +881,10 @@ CHARSET = iso-8859-1
 ; faster and more stable.
 ;TOC_FULL_SYNTAX = true
 
+; If false the %color=... %% syntax will be disabled. Since 1.3.11
+; Default: true
+;ENABLE_MARKUP_COLOR = false
+
 ;==========================================================================
 ; Part Six: URL options.
 ;==========================================================================
-- 
2.45.0