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
This commit is contained in:
rvelices
2006-06-27 00:38:19 +00:00
parent 83bc64dd8a
commit cbd52c6dd2
2 changed files with 4 additions and 0 deletions
+2
View File
@@ -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');
}
?>
+2
View File
@@ -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');
}
}
?>