jostreff/nsedit
1
0
Fork 0
mirror of https://github.com/tuxis-ie/nsedit.git synced 2025-07-21 19:23:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into issue-107

Browse source 
Add test for pre-PHP 5.4 for pretty-printing logs

Conflicts:
	includes/misc.inc.php
This commit is contained in:
Richard Underwood 2016-08-26 10:00:51 +01:00
commit 7c767b7769
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logs.php
View file

@ -68,7 +68,11 @@ if ($logging !== TRUE) {
$entries=getlogs();
}
print json_encode($entries,JSON_PRETTY_PRINT);
if(defined('JSON_PRETTY_PRINT')) {
print json_encode($entries,JSON_PRETTY_PRINT);
} else {
print json_encode($entries);
}
break;
case "clear":