Merge commit 'v7.10.19' into WebGUI8

This commit is contained in:
Colin Kuskie 2011-10-25 20:31:50 -07:00
commit 4fea10a1f5
52 changed files with 490 additions and 77 deletions

View file

@ -162,9 +162,7 @@ sub www_exportStatus {
return $session->privilege->insufficient
unless $session->user->isInGroup(13);
my $form = $session->form;
my @vars = qw(
index depth userId extrasUploadsAction rootUrlAction exportUrl exportRelated
);
my @vars = qw(index depth userId rootUrlAction exportUrl exportRelated);
$asset->forkWithStatusPage({
plugin => 'ProgressTree',
title => 'Page Export Status',
@ -173,6 +171,9 @@ sub www_exportStatus {
message => 'Your assets have been exported!',
groupId => 13,
args => {
# Note the difference in spelling...
# v---no s s-----v
extrasUploadAction => scalar $form->get('extrasUploadsAction'),
assetId => $asset->getId,
map { $_ => scalar $form->get($_) } @vars
}