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

MDL-34873 fix multiple E_STRICT tag related problems

Browse source
This commit is contained in:
Petr Škoda 2012-08-19 10:17:12 +02:00
parent c92d6f417c
commit 7c2cc9c85e
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
blocks/tags/block_tags.php
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');

3
tag/edit.php
View file

@ -106,7 +106,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

6
tag/lib.php
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

3
tag/locallib.php
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();