mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'w04_MDL-31184_m23_glosreset' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Aparup Banerjee 2012-01-24 06:57:57 +08:00
commit 5b80391fde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/glossary/lib.php
View File

@ -2531,8 +2531,8 @@ function glossary_reset_userdata($data) {
$status[] = array('component'=>$componentstr, 'item'=>get_string('resetglossariesall', 'glossary'), 'error'=>false); $status[] = array('component'=>$componentstr, 'item'=>get_string('resetglossariesall', 'glossary'), 'error'=>false);
} else if (!empty($data->reset_glossary_types)) { } else if (!empty($data->reset_glossary_types)) {
$mainentriessql = "$allentries AND g.mainglossary=1"; $mainentriessql = "$allentriessql AND g.mainglossary=1";
$secondaryentriessql = "$allentries AND g.mainglossary=0"; $secondaryentriessql = "$allentriessql AND g.mainglossary=0";
$mainglossariessql = "$allglossariessql AND g.mainglossary=1"; $mainglossariessql = "$allglossariessql AND g.mainglossary=1";
$secondaryglossariessql = "$allglossariessql AND g.mainglossary=0"; $secondaryglossariessql = "$allglossariessql AND g.mainglossary=0";
@ -2561,14 +2561,14 @@ function glossary_reset_userdata($data) {
glossary_reset_gradebook($data->courseid, 'main'); glossary_reset_gradebook($data->courseid, 'main');
} }
$status[] = array('component'=>$componentstr, 'item'=>get_string('resetglossaries', 'glossary'), 'error'=>false); $status[] = array('component'=>$componentstr, 'item'=>get_string('resetglossaries', 'glossary').': '.get_string('mainglossary', 'glossary'), 'error'=>false);
} else if (in_array('secondary', $data->reset_glossary_types)) { } else if (in_array('secondary', $data->reset_glossary_types)) {
$params[] = 'glossary_entry'; $params[] = 'glossary_entry';
$DB->delete_records_select('comments', "itemid IN ($secondaryentriessql) AND commentarea=?", $params); $DB->delete_records_select('comments', "itemid IN ($secondaryentriessql) AND commentarea=?", $params);
$DB->delete_records_select('glossary_entries', "glossaryid IN ($secondaryglossariessql)", $params); $DB->delete_records_select('glossary_entries', "glossaryid IN ($secondaryglossariessql)", $params);
// remove exported source flag from entries in main glossary // remove exported source flag from entries in main glossary
$DB->execute("UPDATE {glossary_entries $DB->execute("UPDATE {glossary_entries}
SET sourceglossaryid=0 SET sourceglossaryid=0
WHERE glossaryid IN ($mainglossariessql)", $params); WHERE glossaryid IN ($mainglossariessql)", $params);