* Avoid parsing errors with config.php by removing the ?> at the end

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1305 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/config/conf.pl b/config/conf.pl
index 340caec453d7628813025856665b68e760c18506..cc0663585b4e50195fe91546b67e52b33cebb21c 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1679,7 +1679,6 @@ sub save_data {
    print FILE "\tglobal \$motd;\n";
    print FILE "\t\$motd = \"$motd\";\n";
 
-   print FILE "?>\n";
    close FILE;
 }
 

diff --git a/config/config_default.php b/config/config_default.php
index 70500cbab3ddcde67f12eb13e6484b37c29a5ea6..c8fecd83e69a0ab1644fc36eb971fc26b9ddd917 100644 (file)
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -320,5 +320,7 @@ global $ldap_server;
  // For instance, for the "sqclock" plugin, you'd put a line like
  // the following:
  //   $plugins[0] = "sqclock";
+ //   $plugins[1] = "attachment_common";
 
-?>
+// Do not add the closing PHP tag here just because we want to avoid
+// the potential for parsing errors if there is a newline added