diff options
| author | plegall <plg@piwigo.org> | 2006-06-13 20:39:49 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2006-06-13 20:39:49 +0000 |
| commit | 2bcf315efb05855f5c20a28ee79c267d8b3264ea (patch) | |
| tree | feca0d44acb2ed1ab6b606781073bd37590132ab /admin/cat_list.php | |
| parent | 006118d03a7cc4204cc35abfa44051a064776c43 (diff) | |
merge -r1346:1347 from branch 1.6 to trunk (bug 402 fixed).
git-svn-id: http://piwigo.org/svn/trunk@1348 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/cat_list.php')
| -rw-r--r-- | admin/cat_list.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/admin/cat_list.php b/admin/cat_list.php index 4c266c01f..ddeddcaa7 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -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'] ) |