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

// MERGE with 1.4 r7770

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
controllers/CMSController.php
-14
View File
@@ -66,20 +66,6 @@ class CmsControllerCore extends FrontController
$this->assignCase = 2;
else
Tools::redirect('index.php?controller=404');
if((int)(Configuration::get('PS_REWRITING_SETTINGS')))
{
$rewrite_infos = (isset($id_cms) AND !isset($id_cms_category)) ? CMS::getUrlRewriteInformations($id_cms) : CMSCategory::getUrlRewriteInformations($id_cms_category);
$default_rewrite = array();
foreach ($rewrite_infos AS $infos)
{
$arr_link = (isset($id_cms) AND !isset($id_cms_category)) ?
$this->context->link->getCMSLink($id_cms, $infos['link_rewrite'], $this->ssl, $infos['id_lang']) :
$this->context->link->getCMSCategoryLink($id_cms_category, $infos['link_rewrite'], $infos['id_lang']);
$default_rewrite[$infos['id_lang']] = $arr_link;
}
$this->context->smarty->assign('lang_rewrite_urls', $default_rewrite);
}
}
public function setMedia()