merge r6460 from branch 2.1 to trunk

feture 1712 : backmerge r6454, useless feature. It can be done another way
without changing core code.


git-svn-id: http://piwigo.org/svn/trunk@6461 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-06-03 19:01:36 +00:00
parent a79d547f05
commit 8a1f11a294
2 changed files with 1 additions and 2 deletions
-1
View File
@@ -599,7 +599,6 @@ else
if ($page['slideshow'] and $conf['light_slideshow'])
{
$template->set_filenames( array('slideshow' => 'slideshow.tpl'));
$template->assign('BODY_CLASS', 'slideshow');
}
else
{