diff --git a/lang/en_utf8/tag.php b/lang/en_utf8/tag.php index bb744c4d534..64561e5ac00 100644 --- a/lang/en_utf8/tag.php +++ b/lang/en_utf8/tag.php @@ -12,6 +12,7 @@ $string['flag'] = 'Flag'; $string['flagasinappropriate'] = 'Flag as inappropriate'; $string['helprelatedtags'] = 'Comma separated related tags'; $string['id'] = 'id'; +$string['lasttenblogs'] = 'Last 10 blogs'; $string['managetags'] = 'Manage tags'; $string['name'] = 'Tag name'; $string['namesalreadybeeingused'] = 'Tag names already being used'; diff --git a/tag/index.php b/tag/index.php index e4aed35909f..041a9aac30f 100644 --- a/tag/index.php +++ b/tag/index.php @@ -83,8 +83,24 @@ if ($usercount > 0) { } -echo ''; +// print last 10 blogs +print_string('lasttenblogs', 'tag'); +print_box_start(); + +// I was not able to use get_items_tagged_with() because it automatically +// tries to join on 'blog' table, since the itemtype is 'blog'. However blogs +// uses the post table so this would not really work. +if ($blogs = fetch_entries('', 10, 0, 'site', '', $tag->id)) { + + foreach ($blogs as $blog) { + blog_print_entry($blog); + } + +} +print_box_end(); + +echo ''; //----------------- right column ----------------- diff --git a/tag/lib.php b/tag/lib.php index bb9ef7b5d27..033d47138b0 100644 --- a/tag/lib.php +++ b/tag/lib.php @@ -1581,12 +1581,14 @@ function print_tag_management_list($perpage='100') { {$sort} "; - $totalcount = count_records('tag'); - $table->initialbars($totalcount > $perpage); + $totalcount = count_records_sql("SELECT COUNT(DISTINCT(tg.id)) + FROM {$CFG->prefix}tag tg LEFT JOIN {$CFG->prefix}user u ON u.id = tg.userid + $where"); + + $table->initialbars(true); // always initial bars $table->pagesize($perpage, $totalcount); - echo '
'; //retrieve tags from DB @@ -1607,7 +1609,18 @@ function print_tag_management_list($perpage='100') { $timemodified = format_time(time() - $tag->timemodified); $checkbox = ''; $text = ''; - $tagtypes = array('default'=>'default', 'official'=>'official'); + + // get all the possible tag types from db + $tagtypes = array(); + if ($ptypes = get_records_sql("SELECT DISTINCT(tagtype), id FROM {$CFG->prefix}tag")) { + foreach ($ptypes as $ptype) { + $tagtypes[$ptype->tagtype] = $ptype->tagtype; + } + } + // default types + $tagtypes['default']='default'; + $tagtypes['official']='official'; + $tagtype = choose_from_menu ($tagtypes, 'tagtypes['.$tag->id.']', $tag->tagtype, '', '', '0', true); //if the tag if flagged, highlight it