From 8f358ca73dffd69264648167951c0c6db1eea106 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Tue, 3 Aug 2010 07:55:54 +0200 Subject: [PATCH] dibi::dump() turns off HTML tags in CLI mode --- dibi/dibi.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dibi/dibi.php b/dibi/dibi.php index 3dc88500..609fb650 100644 --- a/dibi/dibi.php +++ b/dibi/dibi.php @@ -721,10 +721,13 @@ class dibi $sql = htmlSpecialChars($sql); $sql = preg_replace("#([ \t]*\r?\n){2,}#", "\n", $sql); - // syntax highlight - $sql = preg_replace_callback("#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is", array('dibi', 'highlightCallback'), $sql); - $sql = trim($sql); - echo '
', $sql, "
\n"; + if (PHP_SAPI === 'cli') { + echo trim($sql) . "\n\n"; + } else { + // syntax highlight + $sql = preg_replace_callback("#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is", array('dibi', 'highlightCallback'), $sql); + echo '
', trim($sql), "
\n"; + } } if ($return) {