Merge branch 'seeddms-5.0.x' into develop

This commit is contained in:
Uwe Steinmann 2015-09-30 12:10:39 +02:00
commit 7ba956d760

View File

@ -1417,6 +1417,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status']))); $msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
break; break;
default: default:
$msg = $this->callHook('getTimelineMsg', $document, $item);
if(!is_string($msg))
$msg = '???'; $msg = '???';
} }
$item['msg'] = $msg; $item['msg'] = $msg;