Skip to content

Commit

Permalink
some odities in the form models setformdata when loading from session…
Browse files Browse the repository at this point in the history
… on new form. Plus commented out incorrect parsemessageforplaceholder which produced a notice
  • Loading branch information
pollen8 committed Aug 15, 2013
1 parent 28c993c commit 5ff754e
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions components/com_fabrik/models/form.php
Original file line number Diff line number Diff line change
Expand Up @@ -2881,7 +2881,7 @@ public function getData()
}
}
}
$bits = JArrayHelper::fromObject($data[0]);
$bits = $data;
$bits = array_merge($tmp_data, $bits);
$data = array(FArrayHelper::toObject($bits));
FabrikHelperHTML::debug($data, 'form:getData from session (form not in Mambot and no errors');
Expand Down Expand Up @@ -2970,9 +2970,11 @@ public function getData()
}
}

// $$$ rob - don't see how this could work? $data is an array.

// Test to allow {$my->id}'s to be evald from query strings
$w = new FabrikWorker;
$data = $w->parseMessageForPlaceHolder($data);
/* $w = new FabrikWorker;
$data = $w->parseMessageForPlaceHolder($data); */
$this->data = $data;
FabrikHelperHTML::debug($data, 'form:data');
JDEBUG ? $profiler->mark('queryselect: getData() end') : null;
Expand Down

0 comments on commit 5ff754e

Please sign in to comment.