(retrofit from trunk) Optimization/bug (!): Never use the whole object as a placeholder in ApplyParams !!

SVN:2.1.0[3934]
This commit is contained in:
Denis Flaven
2016-02-29 16:27:17 +00:00
parent 823b33b0f5
commit 5717ae1889

View File

@@ -5432,9 +5432,11 @@ abstract class MetaModel
{ {
// Some environment parameters are objects, we just need scalars // Some environment parameters are objects, we just need scalars
if (is_object($replace)) continue; if (is_object($replace)) continue;
else
$aSearches[] = '$'.$sSearch.'$'; {
$aReplacements[] = (string) $replace; $aSearches[] = '$'.$sSearch.'$';
$aReplacements[] = (string) $replace;
}
} }
return str_replace($aSearches, $aReplacements, $aInput); return str_replace($aSearches, $aReplacements, $aInput);
} }