Fix queries with no free result

Author: iMattPro

factory/idea.php

@@ -286,12 +286,7 @@ public function vote(&$idea, $user_id, $value)
 		}
 
 		// Check whether user has already voted - update if they have
-		$sql = 'SELECT idea_id, vote_value
-			FROM ' . $this->table_votes . '
-			WHERE idea_id = ' . (int) $idea['idea_id'] . '
-				AND user_id = ' . (int) $user_id;
-		$this->db->sql_query_limit($sql, 1);
-		if ($row = $this->db->sql_fetchrow())
+		if ($row = $this->get_users_vote($idea['idea_id'], $user_id))
 		{
 			if ($row['vote_value'] != $value)
 			{
@@ -370,12 +365,7 @@ public function vote(&$idea, $user_id, $value)
 	public function remove_vote(&$idea, $user_id)
 	{
 		// Only change something if user has already voted
-		$sql = 'SELECT idea_id, vote_value
-			FROM ' . $this->table_votes . '
-			WHERE idea_id = ' . (int) $idea['idea_id'] . '
-				AND user_id = ' . (int) $user_id;
-		$this->db->sql_query_limit($sql, 1);
-		if ($row = $this->db->sql_fetchrow())
+		if ($row = $this->get_users_vote($idea['idea_id'], $user_id))
 		{
 			$sql = 'DELETE FROM ' . $this->table_votes . '
 				WHERE idea_id = ' . (int) $idea['idea_id'] . '
@@ -430,4 +420,24 @@ public function get_voters($id)
 
 		return $rows;
 	}
+
+	/**
+	 * Get a user's stored vote value for a given idea
+	 *
+	 * @param int $idea_id The idea id
+	 * @param int $user_id The user id
+	 * @return mixed Array with the row data, false if the row does not exist
+	 */
+	protected function get_users_vote($idea_id, $user_id)
+	{
+		$sql = 'SELECT idea_id, vote_value
+			FROM ' . $this->table_votes . '
+			WHERE idea_id = ' . (int) $idea_id . '
+				AND user_id = ' . (int) $user_id;
+		$result = $this->db->sql_query_limit($sql, 1);
+		$row = $this->db->sql_fetchrow();
+		$this->db->sql_freeresult($result);
+
+		return $row;
+	}
 }

factory/permission_helper.php

@@ -59,8 +59,9 @@ public function set_ideas_forum_permissions($forum_id)
 		$sql = 'SELECT group_id
 			FROM ' . GROUPS_TABLE . "
 			WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'";
-		$this->db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 		$group_id = (int) $this->db->sql_fetchfield('group_id');
+		$this->db->sql_freeresult($result);
 
 		// Get 'f_' local REGISTERED users group permissions array for the ideas forum
 		// Default undefined permissions to ACL_NO