- admin/cat_options page added : manage options for the whole categories

  tree (uploadable, commentable). status and visible will be soon added

- admin.php : $conf_link var to avoid lines longer than 79 characters

- config.upload_available configuration parameter disappear : it's simpler
  to manage with cat_options

- config.show_comments idem : new column categories.commentable, each
  categories can be commentable or not

- categories.site_id becomes a nullable column : a virtual category does
  belong to no site

- function display_select_categories has a new argument : $CSS_classes array
  to optionnaly assign a CSS class to each category in the select field

- added informations in include/config.inc.php for setting default value of :

  - categories.visible
  - categories.status
  - categories.uploadable
  - categories.commentable

- 2 new indexes images_i3(average_rate) and images_i4(hit) : optimizes best
  rated and most visited categories


git-svn-id: http://piwigo.org/svn/trunk@602 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 4 insertions, 4 deletions

diff --git a/category.php b/category.php
index 8de82086d..516be0238 100644
--- a/category.php
+++ b/category.php
@@ -295,10 +295,10 @@ else
 if ( isset ( $page['cat'] ) )
 {
   // upload a picture in the category
-  if ( is_numeric( $page['cat'] )
-       and $page['cat_site_id'] == 1
-       and $conf['upload_available']
-       and $page['cat_uploadable'] )
+  if (is_numeric($page['cat'])
+      and $page['cat_site_id'] == 1
+      and $page['cat_dir'] != ''
+      and $page['cat_uploadable'])
   {
     $url = PHPWG_ROOT_PATH.'upload.php?cat='.$page['cat'];
     $template->assign_block_vars(