diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl index fa773bb5f..fb1a4e5c2 100644 --- a/admin-dev/themes/template/header.tpl +++ b/admin-dev/themes/template/header.tpl @@ -91,7 +91,7 @@ } - + {if $display_header}
diff --git a/classes/AdminController.php b/classes/AdminController.php index faa95b15d..c52340332 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -1628,8 +1628,7 @@ class AdminControllerCore extends Controller $this->redirect_after = $this->context->link->getAdminLink('AdminLogin').(!isset($_GET['logout']) ? '?redirect='.$_SERVER['REQUEST_URI'] : ''); // Set current index - $current_index = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller : ''); - + $current_index = __PS_BASE_URI__.ltrim($_SERVER['SCRIPT_NAME'], '/').(($controller = Tools::getValue('controller')) ? '?controller='.$controller : ''); if ($back = Tools::getValue('back')) $current_index .= '&back='.urlencode($back); self::$currentIndex = $current_index; diff --git a/modules/blocksocial/blocksocial.php b/modules/blocksocial/blocksocial.php index b8a1b1ae2..7877a0b1f 100644 --- a/modules/blocksocial/blocksocial.php +++ b/modules/blocksocial/blocksocial.php @@ -1,13 +1,13 @@ -* @copyright 2007-2010 Prestashop SA -* @version Release: $Revision: 1.4 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -79,13 +79,7 @@ class blocksocial extends Module
 

- -
 
-
- Addons - '.$this->l('This module has been developped by PrestaShop and can only be sold through').' addons.prestashop.com.
- '.$this->l('Please report all bugs to').' addons@prestashop.com '.$this->l('or using our').' '.$this->l('contact form').'. -
'; + '; } public function hookFooter() @@ -100,4 +94,4 @@ class blocksocial extends Module return $this->display(__FILE__, 'blocksocial.tpl'); } } -?> \ No newline at end of file +?>