access to values that are already available."
Fix was worse than the original issue, as the getValue method is used in two
completely different ways in makeRequestArgs and makeAssoc.
This reverts commit
82ccb5452cd953d71c49e0075d9ecbbb2f6b5456.
- private function getValue($line, $partial_ops, $key, $action)
+ private function getValue($line, $key, $action)
{
if (@array_key_exists($action, $line)) {
$value = $line[$action];
} elseif (is_callable($action, false)) {
{
if (@array_key_exists($action, $line)) {
$value = $line[$action];
} elseif (is_callable($action, false)) {
- $value = call_user_func($action, $line, $partial_ops, $key);
+ $value = call_user_func($action, $line, $key);
} else {
$value = $action;
}
} else {
$value = $action;
}
{
$ops = array();
foreach ($relation as $key=>$ref) {
{
$ops = array();
foreach ($relation as $key=>$ref) {
- $ops[$key] = $this->getValue($line, $ops, $key, $ref);
+ $ops[$key] = $this->getValue($line, $key, $ref);
{
$ops = array();
foreach ($relation as $key=>$ref) {
{
$ops = array();
foreach ($relation as $key=>$ref) {
- $value = $this->getValue($line, $ops, $key, $ref);
+ $value = $this->getValue($line, $key, $ref);
if (!is_null($value) && $value != 'NULL') {
$value = "'" . addslashes($value) . "'";
}
if (!is_null($value) && $value != 'NULL') {
$value = "'" . addslashes($value) . "'";
}