Merge "Make sure the parameter 'values' is an array. Bug 1394056" into 1.10_STABLE

htdocs/admin/users/quota.json.php

@@ -21,7 +21,7 @@ $instid = param_integer('instid');
 $disabled = param_boolean('disabled', false);
 $definst = get_field('auth_instance', 'id', 'institution', 'mahara');
 
-$record = get_record_sql('SELECT i.name, i.defaultquota FROM {institution} i JOIN {auth_instance} ai ON (i.name = ai.institution) WHERE ai.id = ?', $instid);
+$record = get_record_sql('SELECT i.name, i.defaultquota FROM {institution} i JOIN {auth_instance} ai ON (i.name = ai.institution) WHERE ai.id = ?', array($instid));
 
 if (!$USER->get('admin') && !$USER->is_institutional_admin($record->name)) {
     json_reply(true, 'You are not an administrator for institution '.$record->name);

htdocs/api/xmlrpc/lib.php

@@ -869,7 +869,7 @@ function get_service_providers($instance) {
 
             a.name = h.appname";
     try {
-        $results = get_records_sql_assoc($query, array('value' => $instance));
+        $results = get_records_sql_assoc($query, array($instance));
     } catch (SQLException $e) {
         // Table doesn't exist yet
         return array();

htdocs/auth/user.php

@@ -147,7 +147,7 @@ class User {
                 WHERE
                     username = ?';
 
-        $user = get_record_sql($sql, $username);
+        $user = get_record_sql($sql, array($username));
 
         if (false == $user) {
             throw new AuthUnknownUserException("User with username \"$username\" is not known");

htdocs/interaction/forum/deletepost.php

@@ -99,7 +99,7 @@ function deletepost_submit(Pieform $form, $values) {
             ON (o.objecttype = 'forum' AND o.objectid = fp.id)
             WHERE fp.id = ?
             AND o.resolvedby IS NULL
-            AND o.resolvedtime IS NULL", $values['post']);
+            AND o.resolvedtime IS NULL", array($values['post']));
 
     if ($objectionable !== false) {
         // Trigger activity.

htdocs/interaction/forum/deletetopic.php

@@ -91,7 +91,7 @@ function deletetopic_submit(Pieform $form, $values) {
             WHERE fp.topic = ?
             AND fp.parent IS NULL
             AND o.resolvedby IS NULL
-            AND o.resolvedtime IS NULL", $topicid);
+            AND o.resolvedtime IS NULL", array($topicid));
 
     if ($objectionable !== false) {
         // Trigger activity.