From e9e683bf1c4cabcfc22afd575509811be5bd6ade Mon Sep 17 00:00:00 2001 From: rurban Date: Sat, 20 Jan 2007 15:54:04 +0000 Subject: [PATCH] rename USE_SEARCHHIGHLIGHT to ENABLE_SEARCHHIGHLIGHT git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5537 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- config/config-default.ini | 4 ++-- config/config-dist.ini | 12 ++++++------ configurator.php | 8 ++++---- lib/IniConfig.php | 7 +++++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/config/config-default.ini b/config/config-default.ini index 98b86facd..7c88f53f4 100644 --- a/config/config-default.ini +++ b/config/config-default.ini @@ -1,4 +1,4 @@ -; $Id: config-default.ini,v 1.49 2007-01-07 18:41:23 rurban Exp $ +; $Id: config-default.ini,v 1.50 2007-01-20 15:54:03 rurban Exp $ ; This is the default PhpWiki configuration for undefined config.ini entries. ; recent development and debugging features: @@ -29,7 +29,7 @@ WYSIWYG_DEFAULT_PAGETYPE_HTML = false UPLOAD_USERDIR = true DISABLE_UNITS = false ; UNITS_EXE = /usr/bin/units -USE_SEARCHHIGHLIGHT = false +ENABLE_SEARCHHIGHLIGHT = true WIKI_NAME = PhpWiki ENABLE_REVERSE_DNS = true diff --git a/config/config-dist.ini b/config/config-dist.ini index e668d18f0..92b592e84 100644 --- a/config/config-dist.ini +++ b/config/config-dist.ini @@ -137,12 +137,12 @@ ; Blog/day/time only. Convenience for a single-user blog theme. ;BLOG_DEFAULT_EMPTY_PREFIX = true -; External Searchengine hits are detected automatically, and can be highlighted -; in the displayed page either with the SearchHighlight plugin, which is currently really ugly, -; or by the experimental inline highlighter (default if DEBUG>0). This is not really stable. -; It might break the appearance of the markup. -; Default: false -;USE_SEARCHHIGHLIGHT = true +; External Searchengine hits are detected automatically and will be +; highlighted in the displayed page if enabled. +; Optionally the actionpage SearchHighlight is also prepended, which +; prints a notice. +; Default: true +;ENABLE_SEARCHHIGHLIGHT = false ;========================================================================== ; Part One: Authentication and security settings. diff --git a/configurator.php b/configurator.php index ed84a8311..4ec852597 100644 --- a/configurator.php +++ b/configurator.php @@ -1,4 +1,4 @@ - @@ -162,7 +162,7 @@ echo '<','?xml version="1.0" encoding="iso-8859-1"?',">\n"; "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + Configuration tool for PhpWiki <?php echo $config_file ?>