oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into WebGUI8. Merged up to 7.10.4

Browse source
This commit is contained in:
Colin Kuskie 2010-11-03 09:47:36 -07:00
commit 5f3014aaee
66 changed files with 3078 additions and 997 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Shortcut.pm
View file

@ -277,7 +277,7 @@ sub getContentLastModified {
my $shortcut = $self->getShortcut; # XXX "newById must get an assetId"
my $shortcuttedRev;
if (defined $shortcut) {
$shortcuttedRev = $shortcut->get('revisionDate');
$shortcuttedRev = $shortcut->getContentLastModified;
return $assetRev > $shortcuttedRev ? $assetRev : $shortcuttedRev;
} else {
return 0;