The local override solution I put into conf.pl was completely (and poorly) over-engin...

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

diff --git a/config/conf.pl b/config/conf.pl
index 0cc305ee91a6b0e741c0422140b916e64d0e8d32..895861a8d6ee70fc8b8f2a3f013388ea21a72d1a 100755 (executable)
--- 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 = <LOCAL> ) {
-                   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";