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

remove op2 code from printable macro

Browse source
This commit is contained in:
Colin Kuskie 2006-07-27 16:49:05 +00:00
parent 54d2d687e8
commit 0d769e2e1e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
7.0.4 7.0.4
- Added a forum.lastPost.user.hasRead variable to the Message Board template. - Added a forum.lastPost.user.hasRead variable to the Message Board template.
- fix: r_printable macro and op2
7.0.3 7.0.3
- Fixed a problem with the 7.0.0-7.0.1 upgrade relating to internationalized - Fixed a problem with the 7.0.0-7.0.1 upgrade relating to internationalized

5
lib/WebGUI/Macro/r_printable.pm
View file

@ -53,9 +53,6 @@ sub process {
my ($temp, @param); my ($temp, @param);
@param = @_; @param = @_;
my $append = 'op=makePrintable'; my $append = 'op=makePrintable';
if ($session->env->get("REQUEST_URI") =~ /op\=/) {
$append = 'op2='.$session->url->escape($append);
}
$temp = $session->url->page($append); $temp = $session->url->page($append);
$temp =~ s/\/\//\//; $temp =~ s/\/\//\//;
$temp = $session->url->append($temp,$session->env->get("QUERY_STRING")); $temp = $session->url->append($temp,$session->env->get("QUERY_STRING"));
@ -65,7 +62,9 @@ sub process {
if ($param[0] ne "linkonly") { if ($param[0] ne "linkonly") {
my %var; my %var;
$var{'printable.url'} = $temp; $var{'printable.url'} = $temp;
$session->errorHandler->warn($param[0]);
if ($param[0] ne "") { if ($param[0] ne "") {
$session->errorHandler->warn('non-null');
$var{'printable.text'} = $param[0]; $var{'printable.text'} = $param[0];
} else { } else {
my $i18n = WebGUI::International->new($session,'Macro_r_printable'); my $i18n = WebGUI::International->new($session,'Macro_r_printable');