aboutsummaryrefslogtreecommitdiffstats
path: root/admin/cat_modify.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2004-12-05 21:28:40 +0000
committerplegall <plg@piwigo.org>2004-12-05 21:28:40 +0000
commit9064686d9990b6830c0cd6a00d95745d3841eb9e (patch)
tree0d2bc6ee0564041f1836fb63c30cfe00738f211b /admin/cat_modify.php
parente4ce82fc27e1e10d697815928ef06c692a3f56da (diff)
- 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
Diffstat (limited to '')
-rw-r--r--admin/cat_modify.php13
1 files changed, 8 insertions, 5 deletions
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&amp;parent_id=';
$navigation = '<a class="" href="'.add_session_id(PHPWG_ROOT_PATH.'admin.php?page=cat_list').'">';
$navigation.= $lang['home'].'</a> <span style="font-size:15px">&rarr;</span>';
-$navigation.= get_cat_display_name(
- $current_category['name'],
+
+$navigation.= get_cat_display_name_cache(
+ $category['uppercats'],
' <span style="font-size:15px">&rarr;</span>',
$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());
}