From 694082b5c5afea63aac70ad074e193d93e8d469e Mon Sep 17 00:00:00 2001
From: jObregon <jorge.obregon@prestashop.com>
Date: Thu, 10 May 2012 15:04:16 +0000
Subject: [PATCH] [-] BO : Check if store is set. [-] BO : #PSCFV-2164 Added
 description for Cache options, and fixed links [-] FO : #PSCFV-2138 Removed *
 on Home Phone (it's not a required field)

---
 classes/controller/AdminController.php           |  2 +-
 controllers/admin/AdminPerformanceController.php | 14 +++++++++++---
 themes/default/order-opc-new-account.tpl         |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index aa0d6aa84..ec0b097c8 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2338,7 +2338,7 @@ class AdminControllerCore extends Controller
 			return;
 
 		$shops = Shop::getShops(true, null, true);
-		if (count($shops) == 1)
+		if (count($shops) == 1 && isset($shops[0]))
 			return array($shops[0], 'shop');
 
 		$assos = array();
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index c66eb021a..0a544246b 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -427,6 +427,7 @@ class AdminPerformanceControllerCore extends AdminController
 				'title' => $this->l('Caching'),
 				'image' => '../img/admin/computer_key.png'
 			),
+			'desc' => $this->l('Caching systems are used to speed up your store by caching data into the server\'s memory, avoiding the exhausting task of querying the database.'),
 			'input' => array(
 				array(
 					'type' => 'hidden',
@@ -502,15 +503,22 @@ class AdminPerformanceControllerCore extends AdminController
 
 	public function initContent()
 	{
+		$phpDotNetSupportedLangs = array('en', 'zh', 'fr', 'de', 'ja', 'pl', 'ro', 'ru', 'fa', 'es', 'tr');
+		$phpLang = in_array($this->context->language->iso_code, $phpDotNetSupportedLangs) ? $this->context->language->iso_code : 'en';
+		
 		if (!extension_loaded('memcache'))
 			$this->warnings[] = $this->l('To use Memcached, you must install the Memcache PECL extension on your server.').'
-				<a href="http://www.php.net/manual/en/memcache.installation.php">http://www.php.net/manual/en/memcache.installation.php</a>';
+				<a href="http://www.php.net/manual/'.substr($phpLang, 0, 2).'/memcache.installation.php" target="_blank">http://www.php.net/manual/'.substr($phpLang, 0, 2).'/memcache.installation.php</a>';
 		if (!extension_loaded('apc'))
+		{
 			$this->warnings[] = $this->l('To use APC, you must install the APC PECL extension on your server.').'
-				<a href="http://fr.php.net/manual/fr/apc.installation.php">http://fr.php.net/manual/fr/apc.installation.php</a>';
+				<a href="http://php.net/manual/'.substr($phpLang, 0, 2).'/apc.installation.php" target="_blank">
+					http://php.net/manual/'.substr($phpLang, 0, 2).'/apc.installation.php
+				</a>';
+		}
 		if (!extension_loaded('xcache'))
 			$this->warnings[] = $this->l('To use Xcache, you must install the Xcache extension on your server.').'
-				<a href="http://xcache.lighttpd.net">http://xcache.lighttpd.net</a>';
+				<a href="http://xcache.lighttpd.net" target="_blank">http://xcache.lighttpd.net</a>';
 
 		if (!is_writable(_PS_CACHEFS_DIRECTORY_))
 			$this->warnings[] = $this->l('To use the CacheFS directory').' '.realpath(_PS_CACHEFS_DIRECTORY_).' '.$this->l('must be writable');
diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl
index b1d06dc3f..f46337719 100644
--- a/themes/default/order-opc-new-account.tpl
+++ b/themes/default/order-opc-new-account.tpl
@@ -263,7 +263,7 @@
 					<textarea name="other" id="other" cols="26" rows="3"></textarea>
 				</p>
 				<p class="required text">
-					<label for="phone">{l s='Home phone'} <sup>*</sup></label>
+					<label for="phone">{l s='Home phone'}</label>
 					<input type="text" class="text" name="phone" id="phone" value="{if isset($guestInformations) && $guestInformations.phone}{$guestInformations.phone}{/if}" />
 				</p>
 				<p class="text is_customer_param">
@@ -362,7 +362,7 @@
 						<textarea name="other_invoice" id="other_invoice" cols="26" rows="3"></textarea>
 					</p>
 					<p class="required text">
-						<label for="phone_invoice">{l s='Home phone'} <sup>*</sup></label>
+						<label for="phone_invoice">{l s='Home phone'}</label>
 						<input type="text" class="text" name="phone_invoice" id="phone_invoice" value="" />
 					</p>
 					<p class="text is_customer_param">