Changeset 301
- Timestamp:
- Jan 19, 2004, 10:18:34 PM (20 years ago)
- Location:
- branches/release-1_3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/release-1_3/admin/infos_images.php
r258 r301 50 50 $query = 'SELECT id,file'; 51 51 $query.= ' FROM '.PREFIX_TABLE.'images'; 52 $query.= ' LEFTJOIN '.PREFIX_TABLE.'image_category ON id = image_id';52 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category ON id = image_id'; 53 53 $query.= ' WHERE category_id = '.$page['cat']; 54 54 $query.= ';'; … … 177 177 $query = 'SELECT id,keywords'; 178 178 $query.= ' FROM '.PREFIX_TABLE.'images'; 179 $query.= ' LEFTJOIN '.PREFIX_TABLE.'image_category ON id = image_id';179 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category ON id = image_id'; 180 180 $query.= ' WHERE category_id = '.$page['cat']; 181 181 $query.= ';'; … … 280 280 $query.= ',storage_category_id,category_id'; 281 281 $query.= ' FROM '.PREFIX_TABLE.'images'; 282 $query.= ' LEFTJOIN '.PREFIX_TABLE.'image_category ON id = image_id';282 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category ON id = image_id'; 283 283 $query.= ' WHERE category_id = '.$page['cat']; 284 284 $query.= $conf['order_by']; -
branches/release-1_3/include/functions_category.inc.php
r296 r301 495 495 $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images'; 496 496 $query.= ' FROM '.PREFIX_TABLE.'images'; 497 $query.= ' LEFTJOIN '.PREFIX_TABLE.'image_category AS ic';497 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic'; 498 498 $query.= ' ON id = ic.image_id'; 499 499 $query.= $page['where']; … … 529 529 $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images'; 530 530 $query.= ' FROM '.PREFIX_TABLE.'images'; 531 $query.= ' LEFTJOIN '.PREFIX_TABLE.'image_category AS ic';531 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic'; 532 532 $query.= ' ON id = ic.image_id'; 533 533 $query.= $page['where']; -
branches/release-1_3/picture.php
r300 r301 44 44 } 45 45 $query.= ' FROM '.PREFIX_TABLE.'images'; 46 $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id = ic.image_id'; 46 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic'; 47 $query.= ' ON id = ic.image_id'; 47 48 $query.= $page['where']; 48 49 $query.= ' AND id = '.$_GET['image_id']; … … 78 79 $query = 'SELECT DISTINCT(id)'; 79 80 $query.= ' FROM '.PREFIX_TABLE.'images'; 80 $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id = ic.image_id'; 81 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic'; 82 $query.= ' ON id = ic.image_id'; 81 83 $query.= $page['where']; 82 84 $query.= $conf['order_by']; … … 140 142 $query = 'SELECT id'; 141 143 $query.= ' FROM '.PREFIX_TABLE.'images'; 142 $query.= ' LEFTJOIN '.PREFIX_TABLE.'image_category AS ic';144 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic'; 143 145 $query.= ' ON id = ic.image_id'; 144 146 $query.= $page['where']; … … 169 171 $query = 'SELECT DISTINCT(id),name,file,tn_ext,storage_category_id'; 170 172 $query.= ' FROM '.PREFIX_TABLE.'images'; 171 $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id'; 173 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic'; 174 $query.= ' ON id=ic.image_id'; 172 175 $query.= $page['where']; 173 176 $query.= $conf['order_by']; … … 277 280 $query = 'SELECT DISTINCT(id),name,file,tn_ext,storage_category_id'; 278 281 $query.= ' FROM '.PREFIX_TABLE.'images'; 279 $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id'; 282 $query.= ' INNER JOIN '.PREFIX_TABLE.'image_category AS ic'; 283 $query.= ' ON id=ic.image_id'; 280 284 $query.= $page['where']; 281 285 $query.= $conf['order_by'];
Note: See TracChangeset
for help on using the changeset viewer.