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

- fix [ 1328728 ] Export exports root page n times

Browse source
This commit is contained in:
Matthew Wilson 2005-12-12 06:32:22 +00:00
parent 4b64a1409c
commit d7ebf75b71
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/6.x.x.txt
View file

@ -5,6 +5,7 @@
- fix [ 1344146 ] deleting recurring events doesn't work - fix [ 1344146 ] deleting recurring events doesn't work
- fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields - fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields
- fix [ 1377276 ] Calendar Pop up issue - fix [ 1377276 ] Calendar Pop up issue
- fix [ 1328728 ] Export exports root page n times
- fix [ 1376621 ] dateSubmitted not updated on posts - fix [ 1376621 ] dateSubmitted not updated on posts
- fix [ 1344111 ] promote/demote swap with non-"published" assets - fix [ 1344111 ] promote/demote swap with non-"published" assets
- fix [ 1372630 ] Syndicated encode "&" also if belong to a HTML entity - fix [ 1372630 ] Syndicated encode "&" also if belong to a HTML entity

2
lib/WebGUI.pm
View file

@ -43,7 +43,7 @@ sub handler {
my $r = shift; my $r = shift;
$session{site} = shift || $r->dir_config('WebguiConfig'); $session{site} = shift || $r->dir_config('WebguiConfig');
my $s = Apache2::ServerUtil->server; 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{wguri} = $r->uri;
$session{config} = WebGUI::Config::getConfig($s->dir_config('WebguiRoot'),$session{site}); $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. ### Add Apache Request stuff to global session. Yes, I know the global hash will eventually be deprecated.

6
lib/WebGUI/AssetExportHtml.pm
View file

@ -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 =cut
@ -263,7 +263,7 @@ sub www_exportGenerate {
printf WebGUI::International::get('could not open path', 'Asset'), $path, $@; printf WebGUI::International::get('could not open path', 'Asset'), $path, $@;
return; return;
} else { } else {
print FILE $self->exportAsHtml({userId=>$userId,extrasUrl=>$extrasURL,uploadsUrl=>$uploadsURL}); print FILE $asset->exportAsHtml({userId=>$userId,extrasUrl=>$extrasURL,uploadsUrl=>$uploadsURL});
close(FILE); close(FILE);
} }
print WebGUI::International::get('done','Asset'); print WebGUI::International::get('done','Asset');