Changeset 1348 for trunk/admin


Ignore:
Timestamp:
Jun 13, 2006, 10:39:49 PM (18 years ago)
Author:
plg
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/cat_list.php

    r1225 r1348  
    250250    $categories[$row['id_uppercat']]['nb_subcats'] = $row['nb_subcats'];
    251251  }
     252
     253  $template->assign_block_vars('categories', array());
    252254}
    253255
    … …  
    268270
    269271  $template->assign_block_vars(
    270     'category',
     272    'categories.category',
    271273    array(
    272274      'NAME'       => $category['name'],
    … …  
    289291  {
    290292    $template->assign_block_vars(
    291       'category.delete',
     293      'categories.category.delete',
    292294      array(
    293295        'URL'=>$self_url.'&delete='.$category['id']
    … …  
    299301  {
    300302    $template->assign_block_vars(
    301       'category.elements',
     303      'categories.category.elements',
    302304      array(
    303305        'URL'=>$base_url.'element_set&cat='.$category['id']
Note: See TracChangeset for help on using the changeset viewer.