moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-43005-master' of git://github.com/ankitagarwal/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2013-11-26 08:42:25 +13:00
commit f9cb086dfc
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blog/index.php
View file

@ -40,7 +40,7 @@ if (empty($CFG->enableblogs)) {
//correct tagid if a text tag is provided as a param //correct tagid if a text tag is provided as a param
if (!empty($tag)) { if (!empty($tag)) {
if ($tagrec = $DB->get_record_sql("SELECT * FROM {tag} WHERE ". $DB->sql_like('name', '?', false), array("%$tag%"))) { if ($tagrec = $DB->get_record('tag', array('name' => $tag))) {
$tagid = $tagrec->id; $tagid = $tagrec->id;
} else { } else {
unset($tagid); unset($tagid);

4
blog/lib.php
View file

@ -880,9 +880,13 @@ function blog_get_headers($courseid=null, $groupid=null, $userid=null, $tagid=nu
$tagrec = $DB->get_record('tag', array('id'=>$tagid)); $tagrec = $DB->get_record('tag', array('id'=>$tagid));
$PAGE->navbar->add($tagrec->name, $blogurl); $PAGE->navbar->add($tagrec->name, $blogurl);
} elseif (!empty($tag)) { } elseif (!empty($tag)) {
if ($tagrec = $DB->get_record('tag', array('name' => $tag))) {
$tagid = $tagrec->id;
$headers['filters']['tag'] = $tagid;
$blogurl->param('tag', $tag); $blogurl->param('tag', $tag);
$PAGE->navbar->add(get_string('tagparam', 'blog', $tag), $blogurl); $PAGE->navbar->add(get_string('tagparam', 'blog', $tag), $blogurl);
} }
}
// Append Search info // Append Search info
if (!empty($search)) { if (!empty($search)) {