Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion magmi/inc/magmi_engine.php
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,8 @@ public function getExceptionTrace($tk, &$traces)
{
$this->_excid++;
$trstr = "";
//FIXME: infinity loop in M2
//todo: improve infinity loop handling in M2
$counter = 0;
foreach ($traces as $trace) {
if (isset($trace["file"])) {
$fname = str_replace(dirname(dirname(__FILE__)), "", $trace["file"]);
Expand All @@ -407,6 +408,10 @@ public function getExceptionTrace($tk, &$traces)
$trstr .= "\n";
}
}
// simple max trace depth fix
if (++$counter % 20 === 0) {
break;
}
}
if (!isset($this->_exceptions[$tk])) {
$this->_exceptions[$tk] = array(0,$this->_excid);
Expand Down