mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
Merged MDL-13725 Remove tag_get_tag_by_id completely. I also re-ordered tag/lib.php a bit
This commit is contained in:
parent
15234a92a1
commit
8479c2e0dd
6 changed files with 445 additions and 429 deletions
|
@ -13,20 +13,24 @@ if (empty($CFG->usetags)) {
|
|||
}
|
||||
|
||||
$tagid = optional_param('id', 0, PARAM_INT); // tag id
|
||||
$tag_name = optional_param('tag', '', PARAM_TAG); // tag
|
||||
if ($tag_name) {
|
||||
$tag = tag_get_id($tag_name, TAG_RETURN_OBJECT);
|
||||
} elseif ($tagid) {
|
||||
$tag = tag_get_tag_by_id($tagid); // for backward compatibility
|
||||
}
|
||||
$tagname = optional_param('tag', '', PARAM_TAG); // tag
|
||||
|
||||
$edit = optional_param('edit', -1, PARAM_BOOL);
|
||||
$userpage = optional_param('userpage', 0, PARAM_INT); // which page to show
|
||||
$perpage = optional_param('perpage', 24, PARAM_INT);
|
||||
|
||||
if (!isset($tag) || !$tag->id) {
|
||||
|
||||
if ($tagname) {
|
||||
$tag = tag_get('name', $tagname, '*');
|
||||
} else if ($tagid) {
|
||||
$tag = tag_get('id', $tagid, '*');
|
||||
}
|
||||
|
||||
if (empty($tag)) {
|
||||
redirect($CFG->wwwroot.'/tag/search.php');
|
||||
}
|
||||
|
||||
|
||||
//create a new page_tag object, defined in pagelib.php
|
||||
$PAGE = page_create_object(PAGE_TAG_INDEX, $tag->id);
|
||||
$pageblocks = blocks_setup($PAGE,BLOCKS_PINNED_BOTH);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue