Changeset 6669 for branches/2.1/include/section_init.inc.php

Timestamp:

Jul 6, 2010, 10:11:06 PM (14 years ago)

Author:

rvelices

Message:

merge r6668 from trunk

• removed function get_extra_fields and its usage (unnecessary + perf issue when retrieving many image ids in a section)
• 2 fixes recent feed.php commit
  • month names were decalated by one
  • strptime function is not implemented under Windows in php
• added somme missing $ROOT_URL in templates

File:

• branches/2.1/include/section_init.inc.php (modified) (4 diffs)

branches/2.1/include/section_init.inc.php

@@ -290 +290 @@
     // Main query
     $query = '
-SELECT DISTINCT(image_id)'.get_extra_fields($conf['order_by']).'
+SELECT DISTINCT(image_id)
   FROM '.IMAGE_CATEGORY_TABLE.'
     INNER JOIN '.IMAGES_TABLE.' ON id = image_id
@@ -324 +324 @@
     {
       $query = '
-SELECT DISTINCT image_id'.get_extra_fields($conf['order_by']).'
+SELECT DISTINCT image_id
   FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.IMAGES_TABLE.' ON image_id=id
   WHERE image_id IN ('.implode(',', $items).')
@@ -441 +441 @@
 
     $query = '
-SELECT DISTINCT(id)'.get_extra_fields($conf['order_by']).'
+SELECT DISTINCT(id)
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
@@ -529 +529 @@
   {
     $query ='
-SELECT DISTINCT(id)'.get_extra_fields($conf['order_by']).'
+SELECT DISTINCT(id)
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id