From 72972da94c34ccd9822e704712d722bad835badc Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Wed, 17 Aug 2011 08:59:04 +0000
Subject: [PATCH] // Fix shop selection in BO

---
 admin-dev/header.inc.php |  4 ++--
 classes/Shop.php         | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php
index eb29fa196..4ff47d2b6 100644
--- a/admin-dev/header.inc.php
+++ b/admin-dev/header.inc.php
@@ -72,8 +72,8 @@ echo '
 				<a id="header_shopname" href="index.php"><span>'.Configuration::get('PS_SHOP_NAME').'</span></a><br />
 				'.Tools::substr($employee->firstname, 0, 1).'.&nbsp;'.htmlentities($employee->lastname, ENT_COMPAT, 'UTF-8').'
 				[ <a href="index.php?logout" id="header_logout"><span>'.translate('logout').'</span></a> ]';
-				if (Context::getContext()->shop->getBaseURI())
-					echo '- <a href="'.Context::getContext()->shop->getBaseURI().'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'"><span>'.translate('View my shop').'</span></a>';
+				if (Context::getContext()->shop->getBaseURL())
+					echo '- <a href="'.Context::getContext()->shop->getBaseURL().'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'"><span>'.translate('View my shop').'</span></a>';
 	echo '		- <a href="index.php?tab=AdminEmployees&id_employee='.(int)$cookie->id_employee.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" style="font-size: 10px;"><img src="../img/admin/employee.gif" alt="" /> '.translate('My preferences').'</a>
 			</span></div>
 			<div id="header_search">
diff --git a/classes/Shop.php b/classes/Shop.php
index dc24fb96e..346bd4ee0 100644
--- a/classes/Shop.php
+++ b/classes/Shop.php
@@ -258,7 +258,6 @@ class ShopCore extends ObjectModel
 	}
 
 	/**
-	 *
 	 * Get shop URI
 	 *
 	 * @return string
@@ -272,6 +271,18 @@ class ShopCore extends ObjectModel
 	{
 		return $this->physical_uri;
 	}
+	
+	/**
+	 * Get shop URL
+	 *
+	 * @return string
+	 */
+	public function getBaseURL()
+	{
+		if (!$this->domain)
+			return false;
+		return 'http://'.$this->domain.$this->physical_uri.$this->virtual_uri;
+	}
 
 	/**
 	 * Get group of current shop