diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 890fecad5..6d26390e4 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -81,6 +81,9 @@ - Replaced Date::Calc with Date::Manip to allow for dates before 1970 and after 2035. (Emiliano Bruni) - Added Date::Manip to the WebGUI distribution. + - bugfix [ 1013370 ] tag appears twice (Vladimir Kondratiev). + - bugfix [ 1016258 ] Empty Trash Typo (Tavis Parker). + - bugfix [ 1017727 ] Redirect URL (on edit page) not redirecting - RFE [ 718739 ]. USS Submission Start/End Dates (Thanks to Roy Johnson). diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index 4cf6179b9..5928e88d6 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -1630,7 +1630,7 @@ INSERT INTO template VALUES (1,'Default WebGUI Yes/No Prompt','

\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n^H; / ^Navigation(TopLevelMenuHorizontal_1000); / ^Navigation(currentMenuHorizontal_1001); / ^a;\r\n
\n\n\n \n \n\n
\r\n^H; / ^Navigation(TopLevelMenuHorizontal_1000); / ^Navigation(currentMenuHorizontal_1001); / ^a;\r\n\n \n ','style',0,0); INSERT INTO template VALUES (1000,'WebGUI 6 Admin Style','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \r\n \r\n\r\n\r\n\n \n \r\n\r\n^AdminBar(2);

\r\n\r\n
\r\n \n \n \r\n
\r\n\r\n\r\n
^H; / ^PageTitle; / ^AdminToggle; / ^LoginToggle; / ^a;
\r\n\r\n\r\n\r\n\r\n\r\n\r\n\n \n ','style',1,1); INSERT INTO template VALUES (4,'Clipboard','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n\r\n\r\n\r\n\r\n
Clipboard\r\n^H; / ^a;
\r\n
PAGES
^Navigation(FlexMenu_1002);		CONTENT
\n\n\n \n \n\n
\r\n\r\n\r\n
\r\n^H; / ^a;\r\n\n \n ','style',0,0); -INSERT INTO template VALUES (1001,'WebGUI 6','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \r\n \n \n \r\n^AdminBar(2);\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n
^L(17,\"\",2); ^AdminToggle;
\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n
\n         \r\n\"home\" \n \"Email\"\r\n\"Print\" \n \"Site \"Plain\r\n^Spacer(56,1);^Spacer(26,1);
\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
^Spacer(53,59);^D(\"%c %D, %y\");
^PageTitle;
^Spacer(53,59);
\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n
^Spacer(53,1);\r\n
\r\n^Navigation(FlexMenu_1002);\r\n


\r\n\r\n		\n \n ^Spacer(53,1);
\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n

Design by Plain Black
\r\n\r\n\n \n ','style',1,1); +INSERT INTO template VALUES (1001,'WebGUI 6','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \r\n \n \n \r\n^AdminBar(2);\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n
^L(17,\"\",2); ^AdminToggle;
\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n
\n         \r\n\"home\" \n \"Email\"\r\n\"Print\" \n \"Site \"Plain\r\n^Spacer(56,1);^Spacer(26,1);
\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
^Spacer(53,59);^D(\"%c %D, %y\");
^PageTitle;
^Spacer(53,59);
\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n
^Spacer(53,1);\r\n
\r\n^Navigation(FlexMenu_1002);\r\n


\r\n\r\n		\n \n ^Spacer(53,1);
\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n

Design by Plain Black
\r\n\n \n ','style',1,1); INSERT INTO template VALUES (3,'Make Page Printable','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n
\n\n\n \n \n\n
© 2001-2004 Plain Black LLC
\r\n\n \n ','style',1,1); INSERT INTO template VALUES (5,'Trash','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n\r\n\r\n\r\n\r\n
Trash\r\n^H; / ^a; / Empty Trash
\r\n
PAGES
^Navigation(FlexMenu_1002);		CONTENT
\n\n\n \n \n\n
\r\n\r\n\r\n
\r\n^H; / ^a; / Empty Trash\r\n\n \n ','style',0,0); INSERT INTO template VALUES (1,'Packages','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \n \n ^AdminBar;\n\n\r\n\r\n\r\n\r\n\r\n
Packages\r\n^H; / ^a;
\r\n
PACKAGES
^Navigation(FlexMenu_1002);		CONTENT
\n\n\n \n \n\n
\r\n\r\n\r\n
\r\n^H; / ^a;\r\n\n \n ','style',0,0); diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index 2b8792015..ef9fcc205 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -120,6 +120,7 @@ sub page { my $output = _processOperations(); if ($output ne "") { $output = _generatePage($output); + $output = WebGUI::HTTP::getHeader().$output; } else { my $useCache = ( $session{form}{op} eq "" && @@ -153,18 +154,16 @@ sub page { } else { $ttl = $session{page}{cacheTimeout}; } + $output = WebGUI::HTTP::getHeader().$output; $cache->set($output, $ttl) if ($useCache); WebGUI::PassiveProfiling::addPage(); # add wobjects on page to passive profile log } } WebGUI::Affiliate::grabReferral(); # process affilliate tracking request - my $httpHeader = WebGUI::HTTP::getHeader(); # This allows an operation or wobject to write directly to the browser. - if ($session{page}{empty}) { - $httpHeader = $output = undef; - } + $output = undef if ($session{page}{empty}); WebGUI::Session::close() unless ($useExistingSession); - return $httpHeader.$output; + return $output; } diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index ffa8e47a0..e5ffb7ab6 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -128,7 +128,7 @@ sub _setupUserInfo { #------------------------------------------------------------------- sub _time { - return &UnixDate(&ParseDate("now")),"%s"); + return &UnixDate(&ParseDate("now"),"%s"); } diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 80825d5df..b9563fe59 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -3838,8 +3838,8 @@ The primary URL of your company. This will appear on all automated emails sent f }, '11' => { - message => q|Empy trash.|, - lastUpdated => 1031514049 + message => q|Empty trash.|, + lastUpdated => 1051514049 }, '492' => {