From a885dc8f4782c75edcb82d468f600ea2fad51092 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 29 Nov 2011 10:24:00 +0000
Subject: [PATCH] setup.php doesn't rewrite .htaccess

---
 html/admin/setup.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/admin/setup.php b/html/admin/setup.php
index 5fb5f1186..3123eeaf2 100644
--- a/html/admin/setup.php
+++ b/html/admin/setup.php
@@ -175,13 +175,13 @@ echo '
 </form>';
  exit();
  }
-if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEPARATOR.'config.inc.php')) {
-  /* if the config file is not found we propose to create one */
-  if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEPARATOR.'constant.php') == false ) {
+if ( is_writable ('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEPARATOR.'constant.php') == false ) {
     echo '<h2 class="error"> Ecriture non possible </h2><p class="warning"> On ne peut pas &eacute;crire dans le r&eacute;pertoire de phpcompta, changez-en les droits </p>';
     exit();
   }
-  create_htaccess();
+create_htaccess();
+
+if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.DIRECTORY_SEPARATOR.'config.inc.php')) {
   echo '<form method="post">';
   echo '<h1 class="info">Entrez les informations n&eacute;cessaires &agrave; phpcompta</h1>';
   require_once('config_file.php');
@@ -191,7 +191,7 @@ if ( ! file_exists('..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'include'.D
   echo '</form>';
   exit();
 }
-  create_htaccess();
+ 
 //----------------------------------------------------------------------
 // End functions
 //