mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-14 05:31:42 +00:00
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
This commit is contained in:
commit
15040a2f92
|
@ -118,7 +118,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
|
||||||
if($user->isAdmin()) {
|
if($user->isAdmin()) {
|
||||||
$data = $document->getTimeline();
|
$data = $document->getTimeline();
|
||||||
|
|
||||||
foreach($data as &$item) {
|
foreach($data as $i=>$item) {
|
||||||
switch($item['type']) {
|
switch($item['type']) {
|
||||||
case 'add_version':
|
case 'add_version':
|
||||||
$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['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:
|
default:
|
||||||
$msg = '???';
|
$msg = '???';
|
||||||
}
|
}
|
||||||
$item['msg'] = $msg;
|
$data[$i]['msg'] = $msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($data as $item) {
|
foreach($data as $item) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user