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

phpmyadmin · Oct 17, 2016 · d37af63 · d37af63
2 parents 61ec405 + 3349102
commit d37af63
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/js/console.js b/js/console.js
@@ -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))