remove op2 code from printable macro
This commit is contained in:
parent
54d2d687e8
commit
0d769e2e1e
2 changed files with 3 additions and 3 deletions
|
|
@ -1,5 +1,6 @@
|
|||
7.0.4
|
||||
- Added a forum.lastPost.user.hasRead variable to the Message Board template.
|
||||
- fix: r_printable macro and op2
|
||||
|
||||
7.0.3
|
||||
- Fixed a problem with the 7.0.0-7.0.1 upgrade relating to internationalized
|
||||
|
|
|
|||
|
|
@ -53,9 +53,6 @@ sub process {
|
|||
my ($temp, @param);
|
||||
@param = @_;
|
||||
my $append = 'op=makePrintable';
|
||||
if ($session->env->get("REQUEST_URI") =~ /op\=/) {
|
||||
$append = 'op2='.$session->url->escape($append);
|
||||
}
|
||||
$temp = $session->url->page($append);
|
||||
$temp =~ s/\/\//\//;
|
||||
$temp = $session->url->append($temp,$session->env->get("QUERY_STRING"));
|
||||
|
|
@ -65,7 +62,9 @@ sub process {
|
|||
if ($param[0] ne "linkonly") {
|
||||
my %var;
|
||||
$var{'printable.url'} = $temp;
|
||||
$session->errorHandler->warn($param[0]);
|
||||
if ($param[0] ne "") {
|
||||
$session->errorHandler->warn('non-null');
|
||||
$var{'printable.text'} = $param[0];
|
||||
} else {
|
||||
my $i18n = WebGUI::International->new($session,'Macro_r_printable');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue