Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

This commit is contained in:
gRoussac
2013-05-02 15:41:34 +02:00
2 changed files with 9 additions and 1 deletions
+8
View File
@@ -491,6 +491,7 @@ class PSCleaner extends Module
$db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_customer > 0'); $db->execute('DELETE FROM `'._DB_PREFIX_.'address` WHERE id_customer > 0');
break; break;
} }
$this->clearAllCaches();
} }
public static function cleanAndOptimize() public static function cleanAndOptimize()
@@ -520,4 +521,11 @@ class PSCleaner extends Module
} }
return $array; return $array;
} }
protected function clearAllCaches()
{
$this->_clearCache('blockcategories.tpl');
$this->_clearCache('blockcategories_footer.tpl');
$this->_clearCache('blocktopmenu.tpl');
}
} }
+1 -1
View File
@@ -424,7 +424,7 @@ function displayImage(domAAroundImgThumb, no_animation)
{ {
$('#bigpic').attr('src', newSrc).load(function() { $('#bigpic').attr('src', newSrc).load(function() {
if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled) if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled)
$(this).attr('rel', domAAroundImgThumb.attr('href')); $('#bigpic').attr('alt', domAAroundImgThumb.attr('href'));
}); });
} }
$('#views_block li a').removeClass('shown'); $('#views_block li a').removeClass('shown');