Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'w34_MDL-34873_m23_tagstrict' of git://github.com/skodak…

…/moodle into MOODLE_23_STABLE
  • Loading branch information...
commit fc08030d8e256a9f62d8618b5f0ebc1517df57c4 2 parents 21fcca1 + 123f7f5
@danpoltawski danpoltawski authored
View
1  blocks/tags/block_tags.php
@@ -40,6 +40,7 @@ function get_content() {
global $CFG, $COURSE, $SITE, $USER, $SCRIPT, $OUTPUT;
if (empty($CFG->usetags)) {
+ $this->content = new stdClass();
$this->content->text = '';
if ($this->page->user_is_editing()) {
$this->content->text = get_string('disabledtags', 'block_tags');
View
3  tag/edit.php
@@ -111,7 +111,8 @@
unset($tagnew->rawname);
} else { // They might be trying to change the rawname, make sure it's a change that doesn't affect name
- $tagnew->name = array_shift(tag_normalize($tagnew->rawname, TAG_CASE_LOWER));
+ $norm = tag_normalize($tagnew->rawname, TAG_CASE_LOWER);
+ $tagnew->name = array_shift($norm);
if ($tag->name != $tagnew->name) { // The name has changed, let's make sure it's not another existing tag
if (tag_get_id($tagnew->name)) { // Something exists already, so flag an error
View
6 tag/lib.php
@@ -558,7 +558,8 @@ function tag_get_related_tags_csv($related_tags, $html=TAG_RETURN_HTML) {
function tag_rename($tagid, $newrawname) {
global $DB;
- if (! $newrawname_clean = array_shift(tag_normalize($newrawname, TAG_CASE_ORIGINAL)) ) {
+ $norm = tag_normalize($newrawname, TAG_CASE_ORIGINAL);
+ if (! $newrawname_clean = array_shift($norm) ) {
return false;
}
@@ -1020,7 +1021,8 @@ function tag_cron() {
function tag_find_tags($text, $ordered=true, $limitfrom='', $limitnum='') {
global $DB;
- $text = array_shift(tag_normalize($text, TAG_CASE_LOWER));
+ $norm = tag_normalize($text, TAG_CASE_LOWER);
+ $text = array_shift($norm);
if ($ordered) {
$query = "SELECT tg.id, tg.name, tg.rawname, COUNT(ti.id) AS count
View
3  tag/locallib.php
@@ -261,7 +261,8 @@ function tag_print_search_results($query, $page, $perpage, $return=false) {
global $CFG, $USER, $OUTPUT;
- $query = array_shift(tag_normalize($query, TAG_CASE_ORIGINAL));
+ $norm = tag_normalize($query, TAG_CASE_ORIGINAL);
+ $query = array_shift($norm);
$count = sizeof(tag_find_tags($query, false));
$tags = array();
Please sign in to comment.
Something went wrong with that request. Please try again.