If site uses multiple forms submitted data can only be retrieved for first form entered.

I have found a problem in a site which uses multiple forms and frontendusers. 
If a user enters data to more than one form and later returns to one of the
forms, only data for the first form completed is redisplayed, the other forms
are displayed blank.

I've dug into the code and the problem appears to be in
cmsms\modules\FormBuilder\FormBuilder.module.php - function
getResponseIDFromFEUID.  The function executes SQL 'SELECT fbr_id FROM ' .
cms_db_prefix(). 'module_fb_formbrowser where feuid=?' which retrieves the first
row on *.module_fb_formbrowser with the supplied feuid, hence the problem.

I've made a local change to pass in the id of the form being processed and
changed the SQL to use it as one of the qualifiers.  The function is called from
both the FormBuilder and FormBrowser modules, since FormBrowser isn't a problem
for me I've added an if condition so that it executes the original SQL.  The
changed code looks like:

if ($formId)
{ 
  $sql = 'SELECT fbr_id FROM ' . cms_db_prefix().
'module_fb_formbrowser where feuid=? and form_id = '.$formId.' ORDER BY
submitted DESC';
}
else
{
  $sql = 'SELECT fbr_id FROM ' . cms_db_prefix().
      'module_fb_formbrowser where feuid=?';
}

Note that I've also changed the SQL to return the most recent row based on the
submitted timestamp since my form is inserting a new row if the form data is
updated.

I've amended the call to this function in
cmsms\modules\FormBuilder\classes\Form.class.php - function Load.  Here I've
captured the form Id from $this->GetId() and passed it into the function call.

That has fixed the problem I had.

I've also made a change to the FormBuilder module to pass a FALSE value (-1) to
the function so the original SQL is currently executed.  The change was made to
cmsms\modules\FormBrowser\classes\Browser.class.php - function LoadResponse.

One other inconsistency that may need tidying up, the function is defined as
getResponseIDFromFEUID, but it is called as GetResponseIDFromFEUID.  I know PHP
is case insensitive with function names, but that may change one day?