option merge of refcheck and refcount

The options refcheck and refcount were merged to refcheck. This reduces
configuration options and make the function more robust.

darcs-hash:20050617201556-7ef76-47841e0b8713a26b6fb7eacffa9e89752f65ae50.gz

2 files changed, 4 insertions, 5 deletions

diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 8be47024c..f151a58e0 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -36,9 +36,8 @@ $conf['maxseclevel'] = 3;                 //Up to which level create editable se
 $conf['camelcase']   = 0;                 //Use CamelCase for linking? (I don't like it) 0|1
 $conf['deaccent']    = 1;                 //convert accented chars to unaccented ones in pagenames?
 $conf['useheading']  = 0;                 //use the first heading in a page as its name
-$conf['refcheck']    = 1;                 //check references before deleting media files
-$conf['refshow']     = 0;                 //show where media files are still used
-$conf['refcount']    = 5;                 //search only no of references to satisfy the refcheck
+$conf['refcheck']    = 5;                 //check for references before deleting media files
+$conf['refshow']     = 0;                 //show where media files are still in use
 
 /* Antispam Features */
 
diff --git a/inc/search.php b/inc/search.php
index 949ecc878..8216d98e5 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -356,9 +356,9 @@ function search_reference(&$data,$base,$file,$type,$lvl,$opts){
   //only search txt files
   if(!preg_match('#\.txt$#',$file)) return true;
 
-  //we finish after five references found. The return value
+  //we finish after 'n' references found. The return value
   //'false' will skip subdirectories to speed search up.
-  if(count($data) >= $conf['refcount']) return false;
+  if(count($data) >= $conf['refcheck']) return false;
   
   $reg = '\{\{ *\:?'.$opts['query'].' *(\|.*)?\}\}';
   search_regex($data,$base,$file,$reg,array($opts['query']));