aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-09-20 21:10:17 +0000
committerz0rglub <z0rglub@piwigo.org>2004-09-20 21:10:17 +0000
commit0b86652fa0c16110cffdb5852804a2f601ff2eba (patch)
treedb1346cf07daf20b86024f31feb24d206f3e8b53
parent86770499b50257360799b748aa164d7751009e36 (diff)
- change language keys
- depending on PHP version and MySQL version, nullable fields might be not returned as key on query - deletion of call to deprecated synchronize_all_users function git-svn-id: http://piwigo.org/svn/trunk@530 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/cat_modify.php17
1 files changed, 11 insertions, 6 deletions
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index ea33f20f4..c6937c4c4 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -92,8 +92,6 @@ if ( isset( $_POST['submit'] ) )
$query.= ' FROM '.USER_ACCESS_TABLE;
$query.= ' WHERE cat_id = '.$_GET['cat_id'];
mysql_query( $query );
- // resynchronize all users
- synchronize_all_users();
}
// checking users favorites
@@ -114,6 +112,14 @@ $query.= ' WHERE a.id = '.$_GET['cat_id'];
$query.= ' AND a.site_id = b.id';
$query.= ';';
$category = mysql_fetch_array( mysql_query( $query ) );
+// nullable fields
+foreach (array('comment','dir') as $nullable)
+{
+ if (!isset($category[$nullable]))
+ {
+ $category[$nullable] = '';
+ }
+}
// Navigation path
$current_category = get_cat_info($_GET['cat_id']);
@@ -127,7 +133,6 @@ $access = ($category['status']=='public')?'ACCESS_FREE':'ACCESS_RESTRICTED';
$lock = ($category['visible']=='true')?'UNLOCKED':'LOCKED';
//----------------------------------------------------- template initialization
-
$template->assign_vars(array(
'CATEGORIES_NAV'=>$navigation,
'CAT_NAME'=>$category['name'],
@@ -142,10 +147,10 @@ $template->assign_vars(array(
'L_EDIT_NAME'=>$lang['description'],
'L_STORAGE'=>$lang['storage'],
'L_EDIT_COMMENT'=>$lang['comment'],
- 'L_EDIT_STATUS'=>$lang['conf_general_access'],
+ 'L_EDIT_STATUS'=>$lang['conf_access'],
'L_EDIT_STATUS_INFO'=>$lang['cat_access_info'],
- 'L_ACCESS_FREE'=>$lang['conf_general_access_1'],
- 'L_ACCESS_RESTRICTED'=>$lang['conf_general_access_2'],
+ 'L_ACCESS_FREE'=>$lang['free'],
+ 'L_ACCESS_RESTRICTED'=>$lang['restricted'],
'L_EDIT_LOCK'=>$lang['cat_lock'],
'L_EDIT_LOCK_INFO'=>$lang['cat_lock_info'],
'L_YES'=>$lang['yes'],