exception: Account for $call['file'] and $call['line'] being unset

Bug: 55634
Change-Id: I1173216cade73216848816f6bb51e54096abdfde

diff --git a/includes/Exception.php b/includes/Exception.php
index 39fe6f4..6724c4a 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -737,7 +737,15 @@ class MWExceptionHandler {
                                }
                        }
 
-                       $finalExceptionText .= "#{$i} {$call['file']}({$call['line']}): ";
+                       if ( isset( $call['file'] ) && isset( $call['line'] ) ) {
+                               $finalExceptionText .= "#{$i} {$call['file']}({$call['line']}): ";
+                       } else {
+                               // 'file' and 'line' are unset for calls via call_user_func (bug 55634)
+                               // This matches behaviour of Exception::getTraceAsString to instead
+                               // display "[internal function]".
+                               $finalExceptionText .= "#{$i} [internal function]: ";
+                       }
+
                        if ( isset( $call['class'] ) ) {
                                $finalExceptionText .= $call['class'] . $call['type'] . $call['function'];
                        } else {