Changeset 1120 for trunk/include/section_init.inc.php

Timestamp:

Apr 4, 2006, 2:35:12 AM (18 years ago)

Author:

rvelices

Message:

fix: sql query erros when: no items for the selected tag, search returns
no result, caddie is empty

fix: tag cloud was showing least used tags

fix: strip html tags from head/title element on the page
(tag index page title contained <a>...)

improvement: added 5 tag levels in css for "ready to use" tags

fix: corrected png icon calendar_created.png for IE

fix: english language for nbm

File:

• trunk/include/section_init.inc.php (modified) (6 diffs)

trunk/include/section_init.inc.php

@@ -162 +162 @@
       }
     }
-    
+
     array_push(
       $page['tags'],
@@ -306 +306 @@
         'uppercats'        => $result['uppercats'],
 
-        'title' => get_cat_display_name($result['name'], null, false),
+        'title' => get_cat_display_name($result['name'], '', false),
         )
       );
@@ -361 +361 @@
     // reachable to the connected user, we need to check category
     // associations
-    if (!empty($user['forbidden_categories']))
+    if (!empty($user['forbidden_categories']) and !empty($items) )
     {
       $query = '
@@ -382 +382 @@
     $result = pwg_query($query);
     $tag_infos = array();
-    
+
     while ($row = mysql_fetch_array($result))
     {
@@ -429 +429 @@
     include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' );
 
-    $query = '
+    $search_items = get_search_items($page['search']);
+    if ( !empty($search_items) )
+    {
+      $query = '
 SELECT DISTINCT(id)
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
-  WHERE id IN ('.implode(',', get_search_items($page['search'])).')
+  WHERE id IN ('.implode(',', $search_items).')
     AND '.$forbidden.'
   '.$conf['order_by'].'
-;'; 
+;';
+      $page['items'] = array_from_query($query, 'id');
+    }
+    else
+    {
+      $page['items'] = array();
+    }
 
     $page = array_merge(
@@ -442 +451 @@
       array(
         'title' => $lang['search_result'],
-        'items' => array_from_query($query, 'id'),
         'thumbnails_include' => 'include/category_default.inc.php',
         )