From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Fri, 12 Dec 2014 21:30:36 +0000 (+0100)
Subject: GlobalFunctions: Fix 'Undefined index' notice in wfBacktrace
X-Git-Tag: 1.31.0-rc.0~12975^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=c819a558fe89372d1e8e58839e687bdcf27c3b78;p=lhc%2Fweb%2Fwiklou.git

GlobalFunctions: Fix 'Undefined index' notice in wfBacktrace

Notice: Undefined index: line in
/var/www/wiki/includes/GlobalFunctions.php on line 1840

Caused by fc2e6df64ffabe9236b8b5eee43d3d89e235670a, previous versions
used isset here.

Change-Id: Ie9434f09e0905346ace19909fb316d47c75e0440
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 60c550c641..1cb2f56c8e 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1837,7 +1837,7 @@ function wfBacktrace( $raw = null ) {
 
 	$frames = array_map( function ( $frame ) use ( $frameFormat ) {
 		$file = !empty( $frame['file'] ) ? basename( $frame['file'] ) : '-';
-		$line = $frame['line'] ?: '-';
+		$line = isset( $frame['line'] ) ? $frame['line'] : '-';
 		$call = $frame['function'];
 		if ( !empty( $frame['class'] ) ) {
 			$call = $frame['class'] . $frame['type'] . $call;