SF.net SVN: postfixadmin:[1405] branches/postfixadmin-2.3

[<chr...@us...>]

Revision: 1405
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1405&view=rev
Author:   christian_boltz
Date:     2012-06-30 11:07:57 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
setup.php:
- fix double inclusion of config.inc.php
  https://sourceforge.net/tracker/?func=detail&atid=937964&aid=3539027&group_id=191583

Modified Paths:
--------------
    branches/postfixadmin-2.3/CHANGELOG.TXT
    branches/postfixadmin-2.3/setup.php

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2012-06-26 18:57:11 UTC (rev 1404)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2012-06-30 11:07:57 UTC (rev 1405)
@@ -16,6 +16,7 @@
   - 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)
 ----------------------------------------------------------------

Modified: branches/postfixadmin-2.3/setup.php
===================================================================
--- branches/postfixadmin-2.3/setup.php	2012-06-26 18:57:11 UTC (rev 1404)
+++ branches/postfixadmin-2.3/setup.php	2012-06-30 11:07:57 UTC (rev 1405)
@@ -123,7 +123,6 @@
     require_once($incpath.'/config.inc.php');
     $config_loaded = 1;
 
-    require($incpath.'/config.inc.php');
     if(isset($CONF['configured'])) {
         if($CONF['configured'] === TRUE) {
             print "<li>Checking \$CONF['configured'] - OK\n";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.