From 2d7b9430f3f9b285f09fba965f3101e07460eee1 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 6 May 2005 18:45:59 +0000
Subject: [PATCH] add TOOLBAR_TEMPLATE_PULLDOWN (AddTemplate icon)

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4707 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 config/config-default.ini | 6 +++++-
 config/config-dist.ini    | 6 ++++++
 lib/IniConfig.php         | 7 +++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/config/config-default.ini b/config/config-default.ini
index 8b34bf561..e0f0c5130 100644
--- a/config/config-default.ini
+++ b/config/config-default.ini
@@ -1,4 +1,4 @@
-; $Id: config-default.ini,v 1.31 2005-04-06 06:41:04 rurban Exp $
+; $Id: config-default.ini,v 1.32 2005-05-06 18:45:59 rurban Exp $
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 
 ; recent development and debugging features:
@@ -17,6 +17,7 @@ ENABLE_LIVESEARCH = false
 GOOGLE_LINKS_NOFOLLOW = true
 USE_SAFE_DBSESSION = false
 ENABLE_DISCUSSION_LINK = false
+ENABLE_CAPTCHA = false
 
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true
@@ -153,3 +154,6 @@ DISABLE_GETIMAGESIZE = false
 ; DBADMIN_PASSWD = 
 ; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
 BABYCART_PATH = /usr/local/bin/babycart
+
+; TOOLBAR_PAGELINK_PULLDOWN = *
+; TOOLBAR_TEMPLATE_PULLDOWN = Template*
diff --git a/config/config-dist.ini b/config/config-dist.ini
index 92b49b388..3b55d9a66 100644
--- a/config/config-dist.ini
+++ b/config/config-dist.ini
@@ -1020,6 +1020,12 @@ BABYCART_PATH = /usr/local/bin/babycart
 ; Blog/day/time only. Convenience for a single-user blog theme.
 ;BLOG_DEFAULT_EMPTY_PREFIX = true
 
+; Add additional EDIT_TOOLBAR buttons if defined:
+; Insert a pagelink from this list:
+;TOOLBAR_PAGELINK_PULLDOWN = *
+; Insert a template from this list:
+;TOOLBAR_TEMPLATE_PULLDOWN = Template*
+
 ;===========================================================================
 ; Part Eight: PLUGINCACHED Pear/Cache Settings
 ;===========================================================================
diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index 51d003abf..797a26f9e 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.89 2005-05-06 16:54:18 rurban Exp $');
+rcs_id('$Id: IniConfig.php,v 1.90 2005-05-06 18:45:59 rurban Exp $');
 
 /**
  * A configurator intended to read its config from a PHP-style INI file,
@@ -162,7 +162,7 @@ function IniConfig($file) {
          'AUTH_USER_FILE', 'AUTH_GROUP_FILE', 'AUTH_SESS_USER', 'AUTH_SESS_LEVEL',
          'GOOGLE_LICENSE_KEY','FORTUNE_DIR',
          'DISABLE_GETIMAGESIZE','DBADMIN_USER','DBADMIN_PASSWD',
-         'SESSION_SAVE_PATH', 'TOOLBAR_PAGELINK_PULLDOWN',
+         'SESSION_SAVE_PATH', 'TOOLBAR_PAGELINK_PULLDOWN', 'TOOLBAR_TEMPLATE_PULLDOWN',
          'EXTERNAL_LINK_TARGET'
          );
 
@@ -832,6 +832,9 @@ function fixup_dynamic_configs($file) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.89  2005/05/06 16:54:18  rurban
+// support optional EXTERNAL_LINK_TARGET, default: _blank
+//
 // Revision 1.88  2005/04/25 20:17:13  rurban
 // captcha feature by Benjamin Drieu. Patch #1110699
 //
-- 
2.45.0