Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

This commit is contained in:
Uwe Steinmann 2015-10-20 18:36:57 +02:00
commit 15040a2f92

View File

@ -118,7 +118,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($user->isAdmin()) {
$data = $document->getTimeline();
foreach($data as &$item) {
foreach($data as $i=>$item) {
switch($item['type']) {
case 'add_version':
$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
@ -132,7 +132,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
default:
$msg = '???';
}
$item['msg'] = $msg;
$data[$i]['msg'] = $msg;
}
foreach($data as $item) {