diff options
Diffstat (limited to '')
| -rw-r--r-- | include/category_subcats.inc.php | 15 | ||||
| -rw-r--r-- | include/functions_tag.inc.php | 17 |
2 files changed, 18 insertions, 14 deletions
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php index f8eb27f9c..08c883d78 100644 --- a/include/category_subcats.inc.php +++ b/include/category_subcats.inc.php @@ -132,7 +132,7 @@ SELECT id, path, tn_ext $thumbnail_src_of[$row['id']] = get_thumbnail_src($row['path'], @$row['tn_ext']); } - + if ($conf['subcatify']) { $template->set_filenames( @@ -142,7 +142,7 @@ SELECT id, path, tn_ext ); $template->assign_block_vars('categories', array()); - + foreach ($categories as $category) { $template->assign_block_vars( @@ -152,7 +152,7 @@ SELECT id, path, tn_ext 'ALT' => $category['name'], 'TITLE' => $lang['hint_category'], 'ICON' => get_icon(@$category['date_last']), - + 'URL' => make_index_url( array( 'category' => $category['category'], @@ -165,7 +165,7 @@ SELECT id, path, tn_ext ) ); } - + $template->assign_var_from_handle('CATEGORIES', 'mainpage_categories'); } else @@ -175,7 +175,7 @@ SELECT id, path, tn_ext $template->assign_block_vars('thumbnails.line', array()); // current row displayed $row_number = 0; - + foreach ($categories as $category) { $template->assign_block_vars( @@ -185,10 +185,11 @@ SELECT id, path, tn_ext 'IMAGE_ALT' => $category['name'], 'IMAGE_TITLE' => $lang['hint_category'], 'IMAGE_TS' => get_icon(@$category['date_last']), - + 'U_IMG_LINK' => make_index_url( array( 'category' => $category['category'], + 'cat_name' => $category['name'], ) ), 'CLASS' => 'thumbCat', @@ -201,7 +202,7 @@ SELECT id, path, tn_ext 'NAME' => $category['name'] ) ); - + // create a new line ? if (++$row_number == $user['nb_image_line']) { diff --git a/include/functions_tag.inc.php b/include/functions_tag.inc.php index 5dd4884f4..3e3934669 100644 --- a/include/functions_tag.inc.php +++ b/include/functions_tag.inc.php @@ -54,7 +54,10 @@ SELECT DISTINCT image_id WHERE category_id NOT IN ('.implode(',', $forbidden_categories).') ;'; $image_ids = array_from_query($images_query, 'image_id'); - + if ( empty($image_ids) ) + { + return array(); + } $tags_query.= ' WHERE image_id IN ('. wordwrap( @@ -63,13 +66,13 @@ SELECT DISTINCT image_id "\n" ).')'; } - + $tags_query.= ' GROUP BY tag_id ;'; $result = pwg_query($tags_query); - + $tags = array(); while ($row = mysql_fetch_array($result)) @@ -93,7 +96,7 @@ SELECT id AS tag_id, name, url_name ORDER BY name ;'; $result = pwg_query($query); - + $tags = array(); while ($row = mysql_fetch_array($result)) @@ -123,7 +126,7 @@ function add_level_to_tags($tags) { return $tags; } - + $total_count = 0; foreach ($tags as $tag) @@ -146,7 +149,7 @@ function add_level_to_tags($tags) foreach (array_keys($tags) as $k) { $tags[$k]['level'] = 1; - + // based on threshold, determine current tag level for ($i = $conf['tags_levels'] - 1; $i >= 1; $i--) { @@ -177,7 +180,7 @@ function get_image_ids_for_tags($tag_ids, $mode = 'AND') { // strategy is to list images associated to each tag $tag_images = array(); - + foreach ($tag_ids as $tag_id) { $query = ' |