fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 02:01:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-19 15:41:14 +09:00
commit 9782c30654
14 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
classes/display/DisplayHandler.class.php
View file

@ -274,7 +274,7 @@ class DisplayHandler extends Handler
$data = Rhymix\Framework\Debug::getDebugData();
$display_content = array_fill_keys(config('debug.display_content'), true);
include RX_BASEDIR . 'common/tpl/debug_comment.html';
$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . PHP_EOL;
$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . "\n";
if ($display_type === 'file')
{
$log_filename = config('debug.log_filename') ?: 'files/debug/YYYYMMDD.php';
@ -293,12 +293,12 @@ class DisplayHandler extends Handler
{
$phpheader = '';
}
FileHandler::writeFile($log_filename, $phpheader . $content . PHP_EOL, 'a');
FileHandler::writeFile($log_filename, $phpheader . $content . "\n", 'a');
$debug_output .= '';
}
else
{
$debug_output .= '<!--' . PHP_EOL . $content . PHP_EOL . '-->' . PHP_EOL;
$debug_output .= '<!--' . "\n" . $content . "\n" . '-->' . "\n";
}
}
}

2
classes/display/VirtualXMLDisplayHandler.php
View file

@ -61,7 +61,7 @@ class VirtualXMLDisplayHandler
$html[] = '</script>';
$html[] = '</head><body></body></html>';
return join(PHP_EOL, $html);
return join("\n", $html);
}
}