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

$content was used where $output should have been used. Fix the problem and give

Browse source 
the variables better names.
This commit is contained in:
Chris Nehren 2008-07-22 20:07:24 +00:00
parent a32b0c04ab
commit bebd82d47b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Macro/Widget.pm
View file

@ -65,15 +65,15 @@ sub process {
$fullUrl = $exportUrl . $storage->getUrl("$assetId.html"); $fullUrl = $exportUrl . $storage->getUrl("$assetId.html");
$wgWidgetPath = $exportUrl . $extras . '/wgwidget.js'; $wgWidgetPath = $exportUrl . $extras . '/wgwidget.js';
$scratch->delete('exportUrl'); $scratch->delete('exportUrl');
my $content = $asset->view; my $viewContent = $asset->view;
WebGUI::Macro::process($session, \$content); WebGUI::Macro::process($session, \$viewContent);
my $containerCss = $extras . '/yui/build/container/assets/container.css'; my $containerCss = $extras . '/yui/build/container/assets/container.css';
my $containerJs = $extras . '/yui/build/container/container-min.js'; my $containerJs = $extras . '/yui/build/container/container-min.js';
my $yahooDomJs = $extras . '/yui/build/yahoo-dom-event/yahoo-dom-event.js'; my $yahooDomJs = $extras . '/yui/build/yahoo-dom-event/yahoo-dom-event.js';
my $wgWidgetJs = $extras . '/wgwidget.js'; my $wgWidgetJs = $extras . '/wgwidget.js';
my $wgWidgetPath = $extras . '/wgwidget.js'; my $wgWidgetPath = $extras . '/wgwidget.js';
my $output = <<OUTPUT; my $fullHtmlOutput = <<OUTPUT;
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
@ -91,11 +91,11 @@ sub process {
</script> </script>
</head> </head>
<body id="widget$assetId"> <body id="widget$assetId">
$content $viewContent
</body> </body>
</html> </html>
OUTPUT OUTPUT
$storage->addFileFromScalar("$assetId.html", $content); $storage->addFileFromScalar("$assetId.html", $fullHtmlOutput);
} }
else { else {
$fullUrl = "http://" . $conf->get("sitename")->[0] . $asset->getUrl; $fullUrl = "http://" . $conf->get("sitename")->[0] . $asset->getUrl;