Changeset 2301 for branches

Timestamp:

Apr 8, 2008, 3:35:02 AM (16 years ago)

Author:

rvelices

Message:

• merge optimizitation of sql query (in section_init from trunk)
• stricter check of url in parse_section_url

Location:

branches/branch-1_7/include

Files:

• functions_url.inc.php (modified) (1 diff)
• section_init.inc.php (modified) (3 diffs)

branches/branch-1_7/include/functions_url.inc.php

@@ -525 +525 @@
         array_push($requested_tag_ids, $matches[1]);
       }
-      else
+      elseif ( !empty($tokens[$i]) )
       {
         array_push($requested_tag_url_names, $tokens[$i]);

branches/branch-1_7/include/section_init.inc.php

@@ -288 +288 @@
     {
       $query = '
-SELECT image_id
+SELECT DISTINCT(image_id)
   FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.IMAGES_TABLE.' ON image_id=id
   WHERE image_id IN ('.implode(',', $items).')
@@ -294 +294 @@
     $conf['order_by'].'
 ;';
-      $items = array_unique(
-        array_from_query($query, 'image_id')
-        );
+      $items = array_from_query($query, 'image_id');
     }
 
@@ -305 +303 @@
       array(
         'title' => $title,
-        'items' => array_values($items),
+        'items' => $items,
         )
       );