| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -1359,7 +1359,7 @@ |
| 1360 | 1360 | * |
| 1361 | 1361 | * @return array of backtrace information |
| 1362 | 1362 | */ |
| 1363 | | -function wfDebugBacktrace() { |
| | 1363 | +function wfDebugBacktrace( $limit = 0 ) { |
| 1364 | 1364 | static $disabled = null; |
| 1365 | 1365 | |
| 1366 | 1366 | if( extension_loaded( 'Zend Optimizer' ) ) { |
| — | — | @@ -1381,7 +1381,7 @@ |
| 1382 | 1382 | return array(); |
| 1383 | 1383 | } |
| 1384 | 1384 | |
| 1385 | | - if ( version_compare( PHP_VERSION, '5.4.0', '>=' ) ) { |
| | 1385 | + if ( $limit && version_compare( PHP_VERSION, '5.4.0', '>=' ) ) { |
| 1386 | 1386 | return array_slice( debug_backtrace( DEBUG_BACKTRACE_PROVIDE_OBJECT, 1 ), 1 ); |
| 1387 | 1387 | } else { |
| 1388 | 1388 | return array_slice( debug_backtrace(), 1 ); |
| — | — | @@ -1446,7 +1446,7 @@ |
| 1447 | 1447 | * @return Bool|string |
| 1448 | 1448 | */ |
| 1449 | 1449 | function wfGetCaller( $level = 2 ) { |
| 1450 | | - $backtrace = wfDebugBacktrace(); |
| | 1450 | + $backtrace = wfDebugBacktrace( $level ); |
| 1451 | 1451 | if ( isset( $backtrace[$level] ) ) { |
| 1452 | 1452 | return wfFormatStackFrame( $backtrace[$level] ); |
| 1453 | 1453 | } else { |