aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-06-27 00:38:19 +0000
committerrvelices <rv-github@modusoptimus.com>2006-06-27 00:38:19 +0000
commitcbd52c6dd20efc8bba66c628dcaea7fcc5711b79 (patch)
tree84232cef56e01c700d62501a2ef3f8198b95746d
parent83bc64dd8a8bc884130f0717b1d7aa2876f06d8b (diff)
merge -r1046 from branch-1_6 to trunk
bug 436: Category thumbnail display not ok if subcatify is false git-svn-id: http://piwigo.org/svn/trunk@1407 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/category_recent_cats.inc.php2
-rw-r--r--include/category_subcats.inc.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/category_recent_cats.inc.php b/include/category_recent_cats.inc.php
index 2663bbcb3..6d4cf86f3 100644
--- a/include/category_recent_cats.inc.php
+++ b/include/category_recent_cats.inc.php
@@ -109,6 +109,7 @@ if ($conf['subcatify'])
}
else
{
+ $template->set_filenames( array( 'thumbnails' => 'thumbnails.tpl',));
// template thumbnail initialization
if (mysql_num_rows($result) > 0)
{
@@ -156,5 +157,6 @@ else
}
}
$conf['level_separator'] = $old_level_separator;
+ $template->assign_var_from_handle('THUMBNAILS', 'thumbnails');
}
?> \ No newline at end of file
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index aefe8e392..7800e6319 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -170,6 +170,7 @@ SELECT id, path, tn_ext
}
else
{
+ $template->set_filenames( array( 'thumbnails' => 'thumbnails.tpl',));
$template->assign_block_vars('thumbnails', array());
// first line
$template->assign_block_vars('thumbnails.line', array());
@@ -210,6 +211,7 @@ SELECT id, path, tn_ext
$row_number = 0;
}
}
+ $template->assign_var_from_handle('THUMBNAILS', 'thumbnails');
}
}
?>