diff options
author | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2015-01-18 17:21:14 +0000 |
---|---|---|
committer | petko <petko@524c5546-5005-0410-9a3e-e25e191bd360> | 2015-01-18 17:21:14 +0000 |
commit | c63212528444f61e8f4f6e527f8390f5ba8921d0 (patch) | |
tree | d09a599cc51075615432686055f318991f714aae | |
parent | e3b09dcf6fa78a0721b4ec1d4fd5d1ea4ac89e32 (diff) | |
download | pmwiki.svn-c63212528444f61e8f4f6e527f8390f5ba8921d0.tar.bz2 |
Enable markup debug messages even when debug_backtrace() is not available.
git-svn-id: svn://pmwiki.org/pmwiki/trunk@3025 524c5546-5005-0410-9a3e-e25e191bd360
-rw-r--r-- | pmwiki.php | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -1,7 +1,7 @@ <?php /* PmWiki - Copyright 2001-2014 Patrick R. Michaud + Copyright 2001-2015 Patrick R. Michaud pmichaud@pobox.com http://www.pmichaud.com/ @@ -1611,10 +1611,14 @@ function Markup($id, $when, $pat=NULL, $rep=NULL) { $MarkupTable[$id]['pat'] = $pat; $MarkupTable[$id]['rep'] = $rep; - if (function_exists('debug_backtrace') && preg_match('!/[^/]*e[^/]*$!', $pat)) { - $dbg = debug_backtrace(); - $MarkupTable[$id]['dbg'] = "! file: {$dbg['0']['file']}, " - . "line: {$dbg['0']['line']}, pat: {$dbg['0']['args'][2]}"; + if (preg_match('!/[^/]*e[^/]*$!', $pat)) { + if (function_exists('debug_backtrace')) { + $dbg = debug_backtrace(); + $MarkupTable[$id]['dbg'] = "! file: {$dbg['0']['file']}, " + . "line: {$dbg['0']['line']}, pat: {$dbg['0']['args'][2]}"; + } + else + $MarkupTable[$id]['dbg'] = "! id: '$id', pat: '$pat'"; } } } |