[-] BO : fix #PSCFV-2983 : add iso_code in URI's for robots.txt

This commit is contained in:
lLefevre
2012-07-03 09:46:06 +00:00
parent 21f7ad42ef
commit 4f489e0f14
+7 -5
View File
@@ -380,8 +380,9 @@ class AdminMetaControllerCore extends AdminController
// Files // Files
fwrite($write_fd, "# Files\n"); fwrite($write_fd, "# Files\n");
foreach ($this->rb_data['Files'] as $file) foreach ($this->rb_data['Files'] as $iso_code => $files)
fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$file."\n"); foreach ($files as $file)
fwrite($write_fd, 'Disallow: '.__PS_BASE_URI__.$iso_code.'/'.$file."\n");
// Sitemap // Sitemap
fwrite($write_fd, "# Sitemap\n"); fwrite($write_fd, "# Sitemap\n");
@@ -584,13 +585,14 @@ class AdminMetaControllerCore extends AdminController
$tab['Files'] = array(); $tab['Files'] = array();
if (Configuration::get('PS_REWRITING_SETTINGS')) if (Configuration::get('PS_REWRITING_SETTINGS'))
{ {
$sql = 'SELECT ml.url_rewrite $sql = 'SELECT ml.url_rewrite, l.iso_code
FROM '._DB_PREFIX_.'meta m FROM '._DB_PREFIX_.'meta m
INNER JOIN '._DB_PREFIX_.'meta_lang ml ON ml.id_meta = m.id_meta INNER JOIN '._DB_PREFIX_.'meta_lang ml ON ml.id_meta = m.id_meta
WHERE m.page IN (\''.implode('\', \'', $disallow_controllers).'\')'; INNER JOIN ps_lang l ON l.id_lang = ml.id_lang
WHERE l.active = 1 AND m.page IN (\''.implode('\', \'', $disallow_controllers).'\')';
if ($results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql)) if ($results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql))
foreach ($results as $row) foreach ($results as $row)
$tab['Files'][] = $row['url_rewrite']; $tab['Files'][$row['iso_code']][] = $row['url_rewrite'];
} }
$tab['GB'] = array( $tab['GB'] = array(