diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 1dfe1cb7d..5a1bf568f 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -5,6 +5,7 @@ - fix [ 1344146 ] deleting recurring events doesn't work - fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields - fix [ 1377276 ] Calendar Pop up issue + - fix [ 1328728 ] Export exports root page n times - fix [ 1376621 ] dateSubmitted not updated on posts - fix [ 1344111 ] promote/demote swap with non-"published" assets - fix [ 1372630 ] Syndicated encode "&" also if belong to a HTML entity diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index 0da418251..ea7d44d8d 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -43,7 +43,7 @@ sub handler { my $r = shift; $session{site} = shift || $r->dir_config('WebguiConfig'); my $s = Apache2::ServerUtil->server; -# $s->add_version_component("WebGUI/".$WebGUI::VERSION); # had to remove b/c it was appending on every request for that instance of httpd. :( + $s->add_version_component("WebGUI/".$WebGUI::VERSION); # had to remove b/c it was appending on every request for that instance of httpd. :( $session{wguri} = $r->uri; $session{config} = WebGUI::Config::getConfig($s->dir_config('WebguiRoot'),$session{site}); ### Add Apache Request stuff to global session. Yes, I know the global hash will eventually be deprecated. diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm index ed66c7312..643d265e3 100644 --- a/lib/WebGUI/AssetExportHtml.pm +++ b/lib/WebGUI/AssetExportHtml.pm @@ -204,9 +204,9 @@ sub www_exportStatus { #------------------------------------------------------------------- -=head2 www_exportPageGenerate +=head2 www_exportGenerate -Executes the export process and displays real time status. This operation is displayed by exportPageStatus in an IFRAME. +Executes the export process and displays real time status. This operation is displayed by exportStatus in an IFRAME. =cut @@ -263,7 +263,7 @@ sub www_exportGenerate { printf WebGUI::International::get('could not open path', 'Asset'), $path, $@; return; } else { - print FILE $self->exportAsHtml({userId=>$userId,extrasUrl=>$extrasURL,uploadsUrl=>$uploadsURL}); + print FILE $asset->exportAsHtml({userId=>$userId,extrasUrl=>$extrasURL,uploadsUrl=>$uploadsURL}); close(FILE); } print WebGUI::International::get('done','Asset');