From 0d769e2e1e0fb69c05cd20c567084aa06fb66df5 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 27 Jul 2006 16:49:05 +0000
Subject: [PATCH] remove op2 code from printable macro

---
 docs/changelog/7.x.x.txt        | 1 +
 lib/WebGUI/Macro/r_printable.pm | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0551f52a3..9ac5316a9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -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
diff --git a/lib/WebGUI/Macro/r_printable.pm b/lib/WebGUI/Macro/r_printable.pm
index 5955eb55a..8741548de 100644
--- a/lib/WebGUI/Macro/r_printable.pm
+++ b/lib/WebGUI/Macro/r_printable.pm
@@ -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');