Merge commit 'v7.10.18' into 8
Conflicts: docs/gotcha.txt docs/previousVersion.sql docs/templates.txt lib/WebGUI.pm lib/WebGUI/Asset/File.pm lib/WebGUI/Asset/Story.pm lib/WebGUI/Asset/Wobject/Calendar.pm lib/WebGUI/Asset/Wobject/Thingy.pm lib/WebGUI/AssetExportHtml.pm lib/WebGUI/Content/AssetManager.pm lib/WebGUI/Group.pm lib/WebGUI/Macro/AssetProxy.pm lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm lib/WebGUI/Storage.pm t/Asset/AssetExportHtml.t t/Asset/Story.t t/Shop/TaxDriver/Generic.t t/Storage.t
This commit is contained in:
commit
0c5acb697b
75 changed files with 979 additions and 139 deletions
|
|
@ -25,6 +25,7 @@ use URI::URL ();
|
|||
use Scope::Guard qw(guard);
|
||||
use WebGUI::ProgressTree;
|
||||
use WebGUI::FormBuilder;
|
||||
use WebGUI::Event;
|
||||
|
||||
=head1 NAME
|
||||
|
||||
|
|
@ -957,6 +958,7 @@ sub exportWriteFile {
|
|||
$self->session->output->print($contents);
|
||||
}
|
||||
$fh->close;
|
||||
fire $self->session, 'asset::export' => $dest;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue