diff --git a/tag/index.php b/tag/index.php index 83bb9d5c622..7fd7909c39c 100644 --- a/tag/index.php +++ b/tag/index.php @@ -47,9 +47,9 @@ $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks echo ''; if(blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing()) { - if (!empty($THEME->customcorners)) print_custom_corners_start(); + // if (!empty($THEME->customcorners)) print_custom_corners_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + // if (!empty($THEME->customcorners)) print_custom_corners_end(); } echo ''; @@ -59,7 +59,7 @@ echo ''; echo ''; -if (!empty($THEME->customcorners)) print_custom_corners_start(TRUE); +//if (!empty($THEME->customcorners)) print_custom_corners_start(TRUE); $tagname = tag_display_name($tag); @@ -89,7 +89,7 @@ if ($usercount > 0) { } -if (!empty($THEME->customcorners)) print_custom_corners_end(); +//if (!empty($THEME->customcorners)) print_custom_corners_end(); echo ''; @@ -100,9 +100,9 @@ $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks echo ''; if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $PAGE->user_is_editing()) { - if (!empty($THEME->customcorners)) print_custom_corners_start(); + // if (!empty($THEME->customcorners)) print_custom_corners_start(); blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); + // if (!empty($THEME->customcorners)) print_custom_corners_end(); } echo ''; diff --git a/tag/lib.php b/tag/lib.php index e9230c8d115..42679b12332 100644 --- a/tag/lib.php +++ b/tag/lib.php @@ -698,7 +698,7 @@ function related_tags($tag_name_or_id, $limitnum=10) { $tag_id = tag_id_from_string($tag_name_or_id); //gets the manually added related tags - $manual_related_tags = get_item_tags('tag',$tag_id); + $manual_related_tags = get_item_tags('tag',$tag_id, 'id, name, rawname, tagtype, flag'); if ($manual_related_tags == false) $manual_related_tags = array(); //gets the correlated tags @@ -729,7 +729,7 @@ function correlated_tags($tag_name_or_id) { $tags_id_csv_with_apos = stripcslashes($tag_correlation->correlatedtags); - return get_records_select('tag', "id IN ({$tags_id_csv_with_apos})", '', 'id, name, rawname, tagtype'); + return get_records_select('tag', "id IN ({$tags_id_csv_with_apos})", '', 'id, name, rawname, tagtype, flag'); } /** @@ -1087,7 +1087,7 @@ function tag_cron(){ } } -/*-------------------- Printçing functions -------------------- */ +/*-------------------- Printing functions -------------------- */ /** * Prints a box that contains the management links of a tag diff --git a/tag/pagelib.php b/tag/pagelib.php index 81e162db166..d6505fc6105 100644 --- a/tag/pagelib.php +++ b/tag/pagelib.php @@ -2,10 +2,6 @@ require_once($CFG->libdir.'/pagelib.php'); require_once('lib.php'); -require_once($CFG->dirroot.'/lib/weblib.php'); -if (!empty($THEME->customcorners)) { - require_once($CFG->dirroot.'/lib/custom_corners_lib.php'); -} define('PAGE_TAG_INDEX', 'tag-index');