From 47649d43283dee1c8fa7780343e0ed4a967e6ac2 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sat, 21 Jan 2012 16:31:04 +0100 Subject: [PATCH] MDL-31184 fix multiple problems when reseting individual glossary types --- mod/glossary/lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 2c4ac782749..0ceae7daed2 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -2531,8 +2531,8 @@ function glossary_reset_userdata($data) { $status[] = array('component'=>$componentstr, 'item'=>get_string('resetglossariesall', 'glossary'), 'error'=>false); } else if (!empty($data->reset_glossary_types)) { - $mainentriessql = "$allentries AND g.mainglossary=1"; - $secondaryentriessql = "$allentries AND g.mainglossary=0"; + $mainentriessql = "$allentriessql AND g.mainglossary=1"; + $secondaryentriessql = "$allentriessql AND g.mainglossary=0"; $mainglossariessql = "$allglossariessql AND g.mainglossary=1"; $secondaryglossariessql = "$allglossariessql AND g.mainglossary=0"; @@ -2561,14 +2561,14 @@ function glossary_reset_userdata($data) { 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)) { $params[] = 'glossary_entry'; $DB->delete_records_select('comments', "itemid IN ($secondaryentriessql) AND commentarea=?", $params); $DB->delete_records_select('glossary_entries', "glossaryid IN ($secondaryglossariessql)", $params); // remove exported source flag from entries in main glossary - $DB->execute("UPDATE {glossary_entries + $DB->execute("UPDATE {glossary_entries} SET sourceglossaryid=0 WHERE glossaryid IN ($mainglossariessql)", $params); -- 2.11.4.GIT