adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 09:03:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge -r1346:1347 from branch 1.6 to trunk (bug 402 fixed).

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1348 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2006-06-13 20:39:49 +00:00
parent 006118d03a
commit 2bcf315efb
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/cat_list.php
+5 -3
View File
@@ -249,6 +249,8 @@ SELECT id_uppercat, COUNT(*) AS nb_subcats
{
$categories[$row['id_uppercat']]['nb_subcats'] = $row['nb_subcats'];
}
$template->assign_block_vars('categories', array());
}
foreach ($categories as $category)
@@ -267,7 +269,7 @@ foreach ($categories as $category)
}
$template->assign_block_vars(
'category',
'categories.category',
array(
'NAME' => $category['name'],
'ID' => $category['id'],
@@ -288,7 +290,7 @@ foreach ($categories as $category)
if (empty($category['dir']))
{
$template->assign_block_vars(
'category.delete',
'categories.category.delete',
array(
'URL'=>$self_url.'&delete='.$category['id']
)
@@ -298,7 +300,7 @@ foreach ($categories as $category)
if ($category['nb_images'] > 0)
{
$template->assign_block_vars(
'category.elements',
'categories.category.elements',
array(
'URL'=>$base_url.'element_set&cat='.$category['id']
)