1
0
mirror of https://github.com/dg/dibi.git synced 2025-08-06 06:07:39 +02:00

dibi::dump() fixed in CLI mode

This commit is contained in:
David Grudl
2010-08-27 01:06:05 +02:00
parent b8e518f44b
commit 39add9b8a3

View File

@@ -691,13 +691,13 @@ class dibi
$sql = preg_replace('#[ \t]{2,}#', " ", $sql); $sql = preg_replace('#[ \t]{2,}#', " ", $sql);
$sql = wordwrap($sql, 100); $sql = wordwrap($sql, 100);
$sql = htmlSpecialChars($sql);
$sql = preg_replace("#([ \t]*\r?\n){2,}#", "\n", $sql); $sql = preg_replace("#([ \t]*\r?\n){2,}#", "\n", $sql);
if (PHP_SAPI === 'cli') { if (PHP_SAPI === 'cli') {
echo trim($sql) . "\n\n"; echo trim($sql) . "\n\n";
} else { } else {
// syntax highlight // syntax highlight
$sql = htmlSpecialChars($sql);
$sql = preg_replace_callback("#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is", array('dibi', 'highlightCallback'), $sql); $sql = preg_replace_callback("#(/\\*.+?\\*/)|(\\*\\*.+?\\*\\*)|(?<=[\\s,(])($keywords1)(?=[\\s,)])|(?<=[\\s,(=])($keywords2)(?=[\\s,)=])#is", array('dibi', 'highlightCallback'), $sql);
echo '<pre class="dump">', trim($sql), "</pre>\n"; echo '<pre class="dump">', trim($sql), "</pre>\n";
} }