Move constant parameters directly into the queries

Signed-off-by: Francois Marier <francois@catalyst.net.nz>

htdocs/interaction/forum/edittopic.php

@@ -65,11 +65,11 @@ else { // edit topic
 $forum = get_record_sql(
     'SELECT f.group AS groupid, f.title, g.name AS groupname, g.grouptype, ic.value AS newtopicusers
     FROM {interaction_instance} f
-    INNER JOIN {group} g ON (g.id = f.group AND g.deleted = ?)
+    INNER JOIN {group} g ON (g.id = f.group AND g.deleted = 0)
     LEFT OUTER JOIN {interaction_forum_instance_config} ic ON (f.id = ic.forum AND ic.field = \'createtopicusers\')
     WHERE f.id = ?
-    AND f.deleted != ?',
-    array(0, $forumid, 1)
+    AND f.deleted != 1',
+    array($forumid)
 );
 if (!$forum) {
     throw new NotFoundException(get_string('cantfindforum', 'interaction.forum', $forumid));

htdocs/interaction/forum/topic.php

@@ -44,13 +44,13 @@ $topic = get_record_sql(
     'SELECT p.subject, p.poster, p.id AS firstpost, ' . db_format_tsfield('p.ctime', 'ctime') . ', t.id, f.group AS groupid, g.name AS groupname, f.id AS forumid, f.title AS forumtitle, t.closed, sf.forum AS forumsubscribed, st.topic AS topicsubscribed
     FROM {interaction_forum_topic} t
     INNER JOIN {interaction_instance} f ON (t.forum = f.id AND f.deleted != 1)
-    INNER JOIN {group} g ON (g.id = f.group AND g.deleted = ?)
+    INNER JOIN {group} g ON (g.id = f.group AND g.deleted = 0)
     INNER JOIN {interaction_forum_post} p ON (p.topic = t.id AND p.parent IS NULL)
     LEFT JOIN {interaction_forum_subscription_forum} sf ON (sf.forum = f.id AND sf.user = ?)
     LEFT JOIN {interaction_forum_subscription_topic} st ON (st.topic = t.id AND st.user = ?)
     WHERE t.id = ?
     AND t.deleted != 1',
-    array(0, $USER->get('id'), $USER->get('id'), $topicid)
+    array($USER->get('id'), $USER->get('id'), $topicid)
 );
 
 if (!$topic) {