- 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

1 files changed, 2 insertions, 10 deletions

diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 943bc7b5e..8dcbd0142 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -38,7 +38,7 @@
 $array_cat_directories = array();
   
 $query = '
-SELECT DISTINCT(id),path,file,date_available,category_id
+SELECT DISTINCT(id),path,file,date_available
        ,tn_ext,name,filesize,storage_category_id,average_rate
   FROM '.IMAGES_TABLE.' AS i
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=ic.image_id
@@ -89,15 +89,7 @@ while ($row = mysql_fetch_array($result))
     $thumbnail_title .= ' : '.$row['filesize'].' KB';
   }
   // url link on picture.php page
-  $url_link = PHPWG_ROOT_PATH.'picture.php?';
-  if ($page['cat'] == 'random')
-  {
-    $url_link.= 'cat='.$row['category_id'];
-  }
-  else
-  {
-   $url_link.= 'cat='.$page['cat'];
-  }
+  $url_link = PHPWG_ROOT_PATH.'picture.php?cat='.$page['cat'];
   $url_link.= '&image_id='.$row['id'];
   if ($page['cat'] == 'search')
   {