L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w34_MDL-34873_m23_tagstrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2012-08-20 15:21:26 +08:00
parent 21fcca106d 123f7f534e
commit fc08030d8e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/tags/block_tags.php
+1
View File
@@ -40,6 +40,7 @@ class block_tags extends block_base {
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');
tag/edit.php
+2 -1
View File
@@ -111,7 +111,8 @@ if ($tagnew = $tagform->get_data()) {
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
tag/lib.php
+4 -2
View File
@@ -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
tag/locallib.php
+2 -1
View File
@@ -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();