From 4a809164809da3adaef61ceca4b701944a004bd8 Mon Sep 17 00:00:00 2001 From: tassium Date: Tue, 12 Nov 2002 16:10:05 +0000 Subject: [PATCH] The local override solution I put into conf.pl was completely (and poorly) over-engineered. Thijs suggested an alternate method, which I have used here instead. Thanks Thijs. This will let you edit the override file without having to re-run conf.pl. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4139 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/config/conf.pl b/config/conf.pl index 0cc305ee..895861a8 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -2667,14 +2667,7 @@ sub save_data { print CF "\$use_smtp_tls = $use_smtp_tls;\n"; print CF "\n"; - - if ( open(LOCAL,"config_local.php") ) { - # A config_local.php file exists - add it to the bottom of config.php - while ( $line = ) { - print CF $line; - } - close LOCAL; - } + print CF "\@include SM_PATH . 'config/config_local.php';\n"; print CF "\n/**\n"; print CF " * Make sure there are no characters after the PHP closing\n"; -- 2.25.1