From 4d9a7e684b4ab2f298f70de90ed371653eb8aa85 Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Thu, 26 Jan 2012 17:29:50 +0000
Subject: [PATCH] install-new renamed to install-dev in files

---
 .../themes/default/template/controllers/login/content.tpl   | 1 -
 config/config.inc.php                                       | 6 +++---
 controllers/admin/AdminLoginController.php                  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
index 963ef3568..8c3c700e3 100755
--- a/admin-dev/themes/default/template/controllers/login/content.tpl
+++ b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -78,7 +78,6 @@
 			<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>
diff --git a/config/config.inc.php b/config/config.inc.php
index 93a3908ba..03ec82d26 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -50,9 +50,9 @@ if(!headers_sent())
 if (!file_exists(dirname(__FILE__).'/settings.inc.php'))
 {
 	$dir = ((is_dir($_SERVER['REQUEST_URI']) OR substr($_SERVER['REQUEST_URI'], -1) == '/') ? $_SERVER['REQUEST_URI'] : dirname($_SERVER['REQUEST_URI']).'/');
-	if(!file_exists(dirname(__FILE__).'/../install-new'))
-		die('Error: \'install\' directory is missing');
-	header('Location: install-new/');
+	if (!file_exists(dirname(__FILE__).'/../install-dev'))
+		die('Error: "install" directory is missing');
+	header('Location: install-dev/');
 	exit;
 }
 require_once(dirname(__FILE__).'/settings.inc.php');
diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php
index 2500b11f7..9b22e26b1 100755
--- a/controllers/admin/AdminLoginController.php
+++ b/controllers/admin/AdminLoginController.php
@@ -71,7 +71,7 @@ class AdminLoginControllerCore extends AdminController
 		
 		
 		if (file_exists(_PS_ADMIN_DIR_.'/../install') || file_exists(_PS_ADMIN_DIR_.'/../admin')
-		|| (file_exists(_PS_ADMIN_DIR_.'/../install-new') && (!defined('_PS_MODE_DEV_') || !_PS_MODE_DEV_)))
+		|| (file_exists(_PS_ADMIN_DIR_.'/../install-dev') && (!defined('_PS_MODE_DEV_') || !_PS_MODE_DEV_)))
 			$this->context->smarty->assign(
 				array(
 				'randomNb' => rand(100, 999),