From e0f8d2d8b4d1c08f958f0d0cd0c47d7dd3098a7a Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sat, 30 Jun 2012 11:07:57 +0000 Subject: [PATCH] setup.php: - fix double inclusion of config.inc.php https://sourceforge.net/tracker/?func=detail&atid=937964&aid=3539027&group_id=191583 git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@1405 a1433add-5e2c-0410-b055-b7f2511e0802 --- CHANGELOG.TXT | 1 + setup.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index c73b5b75..1e440e4f 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -16,6 +16,7 @@ changes since the 2.3.5 release (postfixadmin-2.3 branch) - display domain and mailbox description with correct encoding - fix footer link - focus username input field in login form + - fix double inclusion of config.inc.php in setup.php Version 2.3.5 - 2012/01/16 - SVN r1335 (postfixadmin-2.3 branch) ---------------------------------------------------------------- diff --git a/setup.php b/setup.php index dabda2ee..f4a45626 100644 --- a/setup.php +++ b/setup.php @@ -123,7 +123,6 @@ if ($file_config == 1) require_once($incpath.'/config.inc.php'); $config_loaded = 1; - require($incpath.'/config.inc.php'); if(isset($CONF['configured'])) { if($CONF['configured'] === TRUE) { print "
  • Checking \$CONF['configured'] - OK\n";