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

MDL-14772: Prevent official tags from being deleted when tag_instance table is empty. (Patch by Hynek Černoch) (Merge from 1.9)

Browse Source
This commit is contained in:
scyrma
2008-07-07 06:40:35 +00:00
parent ed461df329
commit a72529c73f
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tag/lib.php
+8 -6
View File
@@ -536,7 +536,7 @@ function tag_delete($tagids) {
/**
* Delete one instance of a tag. If the last instance was deleted, it will
* also delete the tag, unless it's type is 'official'.
* also delete the tag, unless its type is 'official'.
*
* @param string $record_type the type of the record for which to remove the instance
* @param int $record_id the id of the record for which to remove the instance
@@ -547,11 +547,13 @@ function tag_delete_instance($record_type, $record_id, $tagid) {
global $CFG, $DB;
if ($DB->delete_records('tag_instance', array('tagid'=>$tagid, 'itemtype'=>$record_type, 'itemid'=>$record_id))) {
if (!$DB->record_exists_sql("SELECT *
FROM {tag} tg, {tag_instance} ti
WHERE (tg.id = ti.tagid AND ti.tagid = ? )
OR (tg.id = ? AND tg.tagtype = 'official')",
array($tagid, $tagid)) ) {
if (!$DB->record_exists_sql("SELECT * ".
"FROM {tag} tg ".
"WHERE tg.id = ? AND ( tg.tagtype = 'official' OR ".
"EXISTS (SELECT 1
FROM {tag_instance} ti
WHERE ti.tagid = ?) )",
array($tagid, $tagid))) {
return tag_delete($tagid);
}
} else {