[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski

This commit is contained in:
gRoussac
2013-10-29 19:05:21 +01:00
parent 6d5ca9969e
commit c98b5e0c78
5 changed files with 28 additions and 0 deletions
+20
View File
@@ -152,6 +152,26 @@ class AdminCmsControllerCore extends AdminController
'cols' => 40,
'hint' => $this->l('Invalid characters:').' <>;=#{}'
),
array(
'type' => 'radio',
'label' => $this->l('Indexation (by search engines):'),
'name' => 'indexation',
'required' => false,
'class' => 't',
'is_bool' => true,
'values' => array(
array(
'id' => 'indexation_on',
'value' => 1,
'label' => $this->l('Enabled')
),
array(
'id' => 'indexation_off',
'value' => 0,
'label' => $this->l('Disabled')
)
),
),
array(
'type' => 'radio',
'label' => $this->l('Displayed:'),
+3
View File
@@ -110,6 +110,9 @@ class CmsControllerCore extends FrontController
'content_only' => (int)(Tools::getValue('content_only')),
'path' => $path
));
if ($this->cms->indexation == 0)
$this->context->smarty->assign('nobots', true);
}
else if ($this->assignCase == 2)
{