From b7814f51393bff2a200c819256b7b9127b811c73 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 30 Sep 2005 01:51:30 +0000
Subject: [PATCH] bug fixes

---
 docs/changelog/6.x.x.txt             | 1 +
 etc/WebGUI.conf.original             | 5 +++++
 lib/WebGUI/Operation/Subscription.pm | 6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index e5d943b0b..4df9000eb 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -7,6 +7,7 @@
  - fix [ 1238223 ] captcha image broken in WRE
  - fix [ 1288783 ] Captcha picture only works with the latest ImageMagick.
  - fix [ 1306915 ] Missing label on shortcut - Metadata
+ - Fixed a pagination bug in the subscription code pagination.
 
 
 6.7.5
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index 1b844065f..eea9122e6 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -100,6 +100,11 @@ authMethods = LDAP, WebGUI
 
 paymentPlugins = ITransact
 
+# Lisst the shipping plugins you have installed and wish to be
+# available for configuration on the site.
+
+shippingPlugins = ByPrice, ByWeight, PerTransaction
+
 # Specify a the list of assets you want to appear in your
 # Add Content menus.
 
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index f1c086baf..adabb23aa 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -273,7 +273,7 @@ sub www_listSubscriptionCodeBatches {
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	
-	$p = WebGUI::Paginator->new('op=listSubscriptionCodeBatches');
+	$p = WebGUI::Paginator->new(WebGUI::URL::page('op=listSubscriptionCodeBatches'));
 	$p->setDataByQuery("select * from subscriptionCodeBatch");
 
 	$batches = $p->getPageData;
@@ -347,7 +347,7 @@ sub www_listSubscriptionCodes {
 		return _submenu($output, 'listSubscriptionCodes title', 'subscription codes manage');
 	}
 	
-	$p = WebGUI::Paginator->new('op=listSubscriptionCodes'.$ops);
+	$p = WebGUI::Paginator->new(WebGUI::URL::page('op=listSubscriptionCodes'.$ops));
 	$p->setDataByQuery("select t1.*, t2.* from subscriptionCode as t1, subscriptionCodeBatch as t2 where t1.batchId=t2.batchId ".$where);
 
 	$codes = $p->getPageData;
@@ -383,7 +383,7 @@ sub www_listSubscriptions {
 	
 	my $i18n = WebGUI::International->new("Subscription");
 	
-	$p = WebGUI::Paginator->new('op=listSubscriptions');
+	$p = WebGUI::Paginator->new(WebGUI::URL::page('op=listSubscriptions'));
 	$p->setDataByQuery('select subscriptionId, name from subscription where deleted != 1');
 	$subscriptions = $p->getPageData;