aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-06-03 19:01:36 +0000
committerplegall <plg@piwigo.org>2010-06-03 19:01:36 +0000
commit8a1f11a2942f9e20b39fd4ae53a37ee024d374cf (patch)
tree9c31e3a7bbdb5d3fdd32fbcc696b6d9b6f797578
parenta79d547f05218be7fcb24125b9109582da059f1b (diff)
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
-rw-r--r--picture.php1
-rw-r--r--themes/default/template/header.tpl2
2 files changed, 1 insertions, 2 deletions
diff --git a/picture.php b/picture.php
index 0cf563bd3..80679b19f 100644
--- a/picture.php
+++ b/picture.php
@@ -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
{
diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl
index 3a700aa59..807196312 100644
--- a/themes/default/template/header.tpl
+++ b/themes/default/template/header.tpl
@@ -53,7 +53,7 @@
</head>
-<body id="{$BODY_ID}" {if isset($BODY_CLASS)}class="{$BODY_CLASS}"{/if}>
+<body id="{$BODY_ID}">
<div id="the_page">
{if not empty($header_msgs)}