Merge branch 'MDL-43709-28' of https://github.com/pauln/moodle into MOODLE_28_STABLE

2015-08-04 12:45:10 +08:00
parent 933f0b800a 18bc6d2177
commit f4c182048f
1 changed files with 7 additions and 3 deletions
@@ -6811,16 +6811,20 @@ function forum_reset_userdata($data) {
        $types       = array();
    } else if (!empty($data->reset_forum_types)){
        $removeposts = true;
-        $typesql     = "";
        $types       = array();
+        $sqltypes    = array();
        $forum_types_all = forum_get_forum_types_all();
        foreach ($data->reset_forum_types as $type) {
            if (!array_key_exists($type, $forum_types_all)) {
                continue;
            }
-            $typesql .= " AND f.type=?";
            $types[] = $forum_types_all[$type];
-            $params[] = $type;
+            $sqltypes[] = $type;
+        }
+        if (!empty($sqltypes)) {
+            list($typesql, $typeparams) = $DB->get_in_or_equal($sqltypes);
+            $typesql = " AND f.type " . $typesql;
+            $params = array_merge($params, $typeparams);
        }
        $typesstr = get_string('resetforums', 'forum').': '.implode(', ', $types);
    }