// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
@@ -76,6 +76,11 @@ class BlockPermanentLinks extends Module
return $this->hookLeftColumn($params);
}
function hookFooter($params)
{
return $this->hookLeftColumn($params);
}
function hookHeader($params)
{
$this->context->controller->addCSS(($this->_path).'blockpermanentlinks.css', 'all');
+2 -4
View File
@@ -5,10 +5,8 @@ $_MODULE = array();
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks-header_2f8a6bf31f3bd67bd2d9720c58b19c9a'] = 'Kontakt';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks-header_e1da49db34b0bdfdddaba2ad6552f848'] = 'Sitemap';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks-header_fad9383ed4698856ed467fd49ecf4820'] = 'Bookmark';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks_39355c36cfd8f1d048a1f84803963534'] = 'Permanent Link-Block';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks_3a3bf29ed9ddeb6210a731d2b1454df2'] = 'Fügt einen Block hinzu, der permanente Links anzeigt wie Sitemap, Kontakt, etc.';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks_e1da49db34b0bdfdddaba2ad6552f848'] = 'Sitemap';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks_2f8a6bf31f3bd67bd2d9720c58b19c9a'] = 'Kontakt';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks_05eb51862bc90ef24d04f3f1d8be5274'] = 'Bookmark auf diese Seite';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks_39355c36cfd8f1d048a1f84803963534'] = 'Permanent Link-Block';
$_MODULE['<{blockpermanentlinks}prestashop>blockpermanentlinks_3a3bf29ed9ddeb6210a731d2b1454df2'] = 'Fügt einen Block hinzu, der permanente Links anzeigt wie Sitemap, Kontakt, etc.';
?>
+36
View File
@@ -0,0 +1,36 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;