dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// #PSCFV-5017 : update bad licenses in all files

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17884 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-10-17 06:18:59 +00:00
parent ec82772928
commit e924469a70
991 changed files with 2973 additions and 2973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
classes/controller/FrontController.php
View File

@@ -4,10 +4,10 @@
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* This source file is subject to the Academic Free License (AFL 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
* http://opensource.org/licenses/afl-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.
@@ -21,7 +21,7 @@
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2012 PrestaShop SA
* @version Release: $Revision: 7483 $
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
@@ -1043,17 +1043,17 @@ class FrontControllerCore extends Controller
}
}
/**
/**
* Returns the template corresponding to the current page.
* By default this method return false but could easily be overridden in a specific controller
*
* @since 1.5
* @return bool
*/
public function getOverrideTemplate()
{
return false;
}
* @since 1.5
* @return bool
*/
public function getOverrideTemplate()
{
return Hook::exec('DisplayOverrideTemplate', array('controller' => $this));
}
/**
* Returns the layout corresponding to the current page by using the override system
@@ -1067,8 +1067,8 @@ class FrontControllerCore extends Controller
* @since 1.5
* @return bool|string
*/
public function getLayout()
{
public function getLayout()
{
$entity = Tools::getValue('controller');
$id_item = (int)Tools::getValue('id_'.$entity);