aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-07-27 12:50:37 +0000
committerplegall <plg@piwigo.org>2010-07-27 12:50:37 +0000
commitb0e523b218dbd272cf65fe6e8c69d929b9f8e2b4 (patch)
tree64bc3b0db21b76b0558f166d6324e03930d2c69b
parenta61e471e02b901727842745304b52f5c357734e8 (diff)
merge r6715 from branch 2.1 to trunk
bug 1785 fixed: the number of related tags is no longer hard coded git-svn-id: http://piwigo.org/svn/trunk@6716 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/config_default.inc.php5
-rw-r--r--include/menubar.inc.php2
2 files changed, 4 insertions, 3 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index e0d7b2318..694785bb8 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -631,8 +631,9 @@ $conf['full_tag_cloud_items_number'] = 200;
// cloud in the menubar. Only the most represented tags will be shown
$conf['menubar_tag_cloud_items_number'] = 100;
-// content_tag_cloud_items_number: number of tags to show in the tag
-// cloud on the content page. Only the most represented tags will be shown
+// content_tag_cloud_items_number: number of related tags to show in the tag
+// cloud on the content page, when the current section is not a set of
+// tags. Only the most represented tags will be shown
$conf['content_tag_cloud_items_number'] = 12;
// tags_levels: number of levels to use for display. Each level is bind to a
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index a5cc2ffed..133aab6ec 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -143,7 +143,7 @@ function initialize_menu()
else
{
$selection = array_slice( $page['items'], $page['start'], $page['nb_image_page'] );
- $tags = add_level_to_tags( get_common_tags($selection, 12) );
+ $tags = add_level_to_tags( get_common_tags($selection, $conf['content_tag_cloud_items_number']) );
foreach ($tags as $tag)
{
$block->data[] =