[phpwiki-checkins] CVS: phpwiki/lib IniConfig.php,1.84,1.85

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2488/lib

Modified Files:
	IniConfig.php 
Log Message:
configurator recursion fixes, dont print temp _dsn vars

Index: IniConfig.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/IniConfig.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -2 -b -p -d -r1.84 -r1.85
--- IniConfig.php	27 Mar 2005 18:23:40 -0000	1.84
+++ IniConfig.php	27 Mar 2005 20:36:16 -0000	1.85
@@ -578,5 +578,5 @@ function fixup_static_configs($file) {
     	$error = sprintf("%s may not be empty. Please update your configuration.", 
        			 "ADMIN_USER");
-        if (!preg_match("/config\-dist\.ini$/", $file)) { // protect against recursion
+        if (!preg_match("/config\-(dist|default)\.ini$/", $file)) { // protect against recursion
             include_once(dirname(__FILE__)."/install.php");
             run_install("_part1");
@@ -589,5 +589,5 @@ function fixup_static_configs($file) {
     if (!defined('ADMIN_PASSWD') or ADMIN_PASSWD == '') {
         $error = "The ADMIN_USER password cannot be empty. Please update your configuration.";
-        if (!preg_match("/config\-dist\.ini$/", $file)) { // protect against recursion
+        if (!preg_match("/config\-(dist|default)\.ini$/", $file)) { // protect against recursion
             include_once(dirname(__FILE__)."/install.php");
             run_install("_part1");
@@ -831,4 +831,7 @@ function fixup_dynamic_configs($file) {
 
 // $Log$
+// Revision 1.85  2005/03/27 20:36:16  rurban
+// configurator recursion fixes, dont print temp _dsn vars
+//
 // Revision 1.84  2005/03/27 18:23:40  rurban
 // compute locale only for setlocale and LC_ALL