Ignore:
Timestamp:
09/18/12 13:46:56 (7 years ago)
Author:
plg
Message:

merge r17980 from trunk to branch 2.4

little code refactoring over r17424

bug fixed on Edit Photo page when associating with no album.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/admin/include/functions.php

    r17981 r17982  
    16031603    JOIN '.IMAGES_TABLE.' ON image_id=id 
    16041604  WHERE id IN ('.implode(',', $images).') 
    1605     '.((is_array($categories) and count($categories)>0) ? 'AND category_id NOT IN ('.implode(',', $categories).')' : null).' 
     1605'; 
     1606   
     1607  if (is_array($categories) and count($categories) > 0) 
     1608  { 
     1609    $query.= ' 
     1610    AND category_id NOT IN ('.implode(',', $categories).') 
     1611'; 
     1612  } 
     1613 
     1614  $query.= ' 
    16061615    AND (storage_category_id IS NULL OR storage_category_id != category_id) 
    16071616;'; 
Note: See TracChangeset for help on using the changeset viewer.