From 9064686d9990b6830c0cd6a00d95745d3841eb9e Mon Sep 17 00:00:00 2001 From: plegall Date: Sun, 5 Dec 2004 21:28:40 +0000 Subject: - on picture.php, related categories under the element are displayed in global_rank order - when adding a new virtual category, initializes its global_rank - bug fixed : in admin/cat_list, false next rank - in admin/cat_modify, complete directory is calculated only if category is not virtual - admin/picture_modify rewritten : graphically nearer to admin/cat_modify, virtual associations are back - update_category partially rewritten : take an array of categories in parameter, becomes optionnaly recursive, use the set_random_representant function, set a random representant for categories with elements and no representant - bug fixed : on a search results screen, elements belonging to more than 1 category were shown more than once - bug fixed : in admin/cat_modify, changing a value in a textefield and hitting enter was setting a new random representant git-svn-id: http://piwigo.org/svn/trunk@635 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_modify.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'admin/cat_modify.php') diff --git a/admin/cat_modify.php b/admin/cat_modify.php index fc54301d1..c230fcf94 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -101,12 +101,12 @@ foreach (array('comment','dir','site_id') as $nullable) } // Navigation path -$current_category = get_cat_info($_GET['cat_id']); $url = PHPWG_ROOT_PATH.'admin.php?page=cat_list&parent_id='; $navigation = ''; $navigation.= $lang['home'].' →'; -$navigation.= get_cat_display_name( - $current_category['name'], + +$navigation.= get_cat_display_name_cache( + $category['uppercats'], ' →', $url); @@ -136,7 +136,6 @@ $template->assign_vars(array( 'CATEGORIES_NAV'=>$navigation, 'CAT_NAME'=>$category['name'], 'CAT_COMMENT'=>$category['comment'], - 'CATEGORY_DIR'=>preg_replace('/\/$/', '', get_complete_dir($category['id'])), $status=>'checked="checked"', $lock=>'checked="checked"', @@ -184,7 +183,11 @@ SELECT tn_ext,path if (!empty($category['dir'])) { - $template->assign_block_vars('storage' ,array()); + $template->assign_block_vars( + 'storage', + array('CATEGORY_DIR'=>preg_replace('/\/$/', + '', + get_complete_dir($category['id'])))); $template->assign_block_vars('upload' ,array()); } -- cgit v1.2.3