gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 20:51:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-09-23 18:11:17 +02:00
commit fd92628c30
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
views/bootstrap/class.Bootstrap.php
View File

@ -2260,8 +2260,12 @@ mayscript>
$classname = $item['type']."_".$item['status']; $classname = $item['type']."_".$item['status'];
else else
$classname = $item['type']; $classname = $item['type'];
if(!$skip || !in_array($classname, $skip)) if(!$skip || !in_array($classname, $skip)) {
echo "{'start': new Date('".$item['date']."'), 'content': '".$item['msg']."', 'className': '".$classname."'},\n"; $s = explode(' ', $item['date']);
$d = explode('-', $s[0]);
$t = explode(':', $s[1]);
echo "{'start': new Date(".$d[0].",".($d[1]-1).",".$d[2].",".$t[0].",".$t[1].",".$t[2]."), 'content': '".$item['msg']."', 'className': '".$classname."'},\n";
}
} }
?> ?>
/* { /* {