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

[-] MO : Google Sitemap : Duplicate url on combination + undefined $link

Browse Source
This commit is contained in:
fBrignoli
2012-02-07 15:11:06 +00:00
parent d3d033a180
commit a01ac9e5b0
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gsitemap/gsitemap.php
+21 -10
View File
@@ -37,7 +37,7 @@ class Gsitemap extends Module
{ {
$this->name = 'gsitemap'; $this->name = 'gsitemap';
$this->tab = 'seo'; $this->tab = 'seo';
$this->version = '1.7'; $this->version = '1.8';
$this->author = 'PrestaShop'; $this->author = 'PrestaShop';
$this->need_instance = 0; $this->need_instance = 0;
@@ -185,16 +185,21 @@ XML;
$tmp = null; $tmp = null;
$res = null; $res = null;
$done = null;
foreach ($products as $product) foreach ($products as $product)
{ {
if ($tmp == $product['id_product']) if (!isset($done[$product['id_image']]))
$res[$tmp]['images'] []= array('id_image' => $product['id_image'], 'legend_image' => $product['legend_image']);
else
{ {
$tmp = $product['id_product']; if ($tmp == $product['id_product'])
$res[$tmp] = $product; $res[$tmp]['images'] []= array('id_image' => $product['id_image'], 'legend_image' => $product['legend_image']);
unset($res[$tmp]['id_image'], $res[$tmp]['legend_image']); else
$res[$tmp]['images'] []= array('id_image' => $product['id_image'], 'legend_image' => $product['legend_image']); {
$tmp = $product['id_product'];
$res[$tmp] = $product;
unset($res[$tmp]['id_image'], $res[$tmp]['legend_image']);
$res[$tmp]['images'] []= array('id_image' => $product['id_image'], 'legend_image' => $product['legend_image']);
}
$done[$product['id_image']] = true;
} }
} }
@@ -229,7 +234,10 @@ XML;
if (($priority = 0.9 - ($category['level_depth'] / 10)) < 0.1) if (($priority = 0.9 - ($category['level_depth'] / 10)) < 0.1)
$priority = 0.1; $priority = 0.1;
$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? $link->getCategoryLink((int)$category['id_category'], $category['link_rewrite'], (int)$category['id_lang']) : $link->getCategoryLink((int)$category['id_category']); $tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ?
$this->context->link->getCategoryLink((int)$category['id_category'], $category['link_rewrite'], (int)$category['id_lang'])
: $this->context->link->getCategoryLink((int)$category['id_category']);
$this->_addSitemapNode($xml, htmlspecialchars($tmpLink), $priority, 'weekly', substr($category['date_upd'], 0, 10)); $this->_addSitemapNode($xml, htmlspecialchars($tmpLink), $priority, 'weekly', substr($category['date_upd'], 0, 10));
} }
@@ -253,7 +261,9 @@ XML;
$cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql_cms); $cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql_cms);
foreach($cmss as $cms) foreach($cmss as $cms)
{ {
$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? $link->getCMSLink((int)$cms['id_cms'], $cms['link_rewrite'], false, (int)$cms['id_lang']) : $link->getCMSLink((int)$cms['id_cms']); $tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ?
$this->context->link->getCMSLink((int)$cms['id_cms'], $cms['link_rewrite'], false, (int)$cms['id_lang'])
: $this->context->link->getCMSLink((int)$cms['id_cms']);
$this->_addSitemapNode($xml, $tmpLink, '0.8', 'daily'); $this->_addSitemapNode($xml, $tmpLink, '0.8', 'daily');
} }
@@ -385,3 +395,4 @@ XML;
return $this->_html; return $this->_html;
} }
} }