Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

This commit is contained in:
Weblate 2016-10-17 10:05:19 +02:00
commit d37af63415

View File

@ -1235,7 +1235,7 @@ PMA_consoleDebug = {
functionName += dbgStep.type;
}
functionName += dbgStep.function;
if (dbgStep.args.length) {
if (dbgStep.args && dbgStep.args.length) {
functionName += '(...)';
} else {
functionName += '()';
@ -1303,7 +1303,7 @@ PMA_consoleDebug = {
.append(
$('<span class="file">').text(this._formatFileName(step))
);
if (step.args.length) {
if (step.args && step.args.length) {
$stepElem
.append(
$('<span class="args">').html(this._formatFunctionArgs(step))