From 61db68ff595eb1fd971ce2f5a7a827ee428da636 Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Fri, 23 Dec 2011 00:35:43 +0000
Subject: [PATCH] // added check for install-new directory

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11739 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/login/content.tpl | 3 ++-
 controllers/admin/AdminLoginController.php  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/template/login/content.tpl b/admin-dev/themes/template/login/content.tpl
index 04064b888..5901fb6cc 100755
--- a/admin-dev/themes/template/login/content.tpl
+++ b/admin-dev/themes/template/login/content.tpl
@@ -78,6 +78,7 @@
 			<p><span>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}<br /><br />
 				<ul>
 					<li>{l s='delete the /install folder'}</li>
+					<li>{l s='delete the /install-new folder'}</li>
 					<li>{l s='renamed the /admin folder (eg.) /admin'}{$randomNb}</li>
 				</ul>
 			<br />{l s='Please then access this page by the new url (eg.) http://www.domain.tld/admin'}{$randomNb}</span></p>
@@ -100,4 +101,4 @@
 		</form>
 	</div>
 	<h2><a href="http://www.prestashop.com">&copy; Copyright by PrestaShop. all rights reserved.</a></h2>
-</div>
\ No newline at end of file
+</div>
diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php
index 4ad7f1c54..059474751 100755
--- a/controllers/admin/AdminLoginController.php
+++ b/controllers/admin/AdminLoginController.php
@@ -70,7 +70,9 @@ class AdminLoginControllerCore extends AdminController
 		
 		
 		
-		if(file_exists(_PS_ADMIN_DIR_.'/../install') OR file_exists(_PS_ADMIN_DIR_.'/../admin'))
+		if(file_exists(_PS_ADMIN_DIR_.'/../install') || file_exists(_PS_ADMIN_DIR_.'/../admin')
+		|| file_exists(_PS_ADMIN_DIR_.'/../install-new') 
+		)
 			$this->context->smarty->assign(
 				array(
 				'randomNb' => rand(100, 999),
@@ -204,4 +206,4 @@ class AdminLoginControllerCore extends AdminController
 		else if (Tools::isSubmit('ajax'))
 			die(Tools::jsonEncode(array('hasErrors' => true, 'errors' => $this->errors)));
 	}
-}
\ No newline at end of file
+}