Merge branch 'develop'

public_html/classes/changerequest.php

@@ -52,7 +52,7 @@ class ChangeRequest extends CPHPDatabaseRecordClass
 		$sText = NewTemplater::Render("email/change.txt", $locale->strings, array(
 			"campaign-name" => $this->sCampaign->sName,
 			"confirmation-url" => "http://redonate.net/change/{$this->sSubscription->sEmailAddress}/{$this->sId}/{$this->sKey}",
-			"unsubscribe-url" => "http://redonate.com/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
+			"unsubscribe-url" => "http://redonate.net/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
 			"old" => Currency::Format($this->sOldCurrency, $this->sOldAmount),
 			"new" => Currency::Format($this->sNewCurrency, $this->sNewAmount)
 		));
@@ -61,7 +61,7 @@ class ChangeRequest extends CPHPDatabaseRecordClass
 			"contents" => NewTemplater::Render("email/change.html", $locale->strings, array(
 				"campaign-name" => $this->sCampaign->sName,
 				"confirmation-url" => "http://redonate.net/change/{$this->sSubscription->sEmailAddress}/{$this->sId}/{$this->sKey}",
-				"unsubscribe-url" => "http://redonate.com/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
+				"unsubscribe-url" => "http://redonate.net/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
 				"old" => Currency::Format($this->sOldCurrency, $this->sOldAmount),
 				"new" => Currency::Format($this->sNewCurrency, $this->sNewAmount)
 			))

public_html/classes/paymentrequest.php

@@ -62,7 +62,7 @@ class PaymentRequest extends CPHPDatabaseRecordClass
 			"campaign-name" => $this->sCampaign->sName,
 			"amount" => Currency::Format($this->sCurrency, $this->sAmount),
 			"skip-url" => "http://redonate.net/pay/{$this->sSubscription->sEmailAddress}/{$this->sId}/{$this->sKey}/skip",
-			"unsubscribe-url" => "http://redonate.com/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
+			"unsubscribe-url" => "http://redonate.net/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
 			"methods" => $sMethods
 		));
 		
@@ -71,7 +71,7 @@ class PaymentRequest extends CPHPDatabaseRecordClass
 				"campaign-name" => $this->sCampaign->sName,
 				"amount" => Currency::Format($this->sCurrency, $this->sAmount),
 				"skip-url" => "http://redonate.net/pay/{$this->sSubscription->sEmailAddress}/{$this->sId}/{$this->sKey}/skip",
-				"unsubscribe-url" => "http://redonate.com/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
+				"unsubscribe-url" => "http://redonate.net/manage/{$this->sSubscription->sEmailAddress}/{$this->sSubscription->sSettingsKey}",
 				"methods" => $sMethods
 			))
 		));

public_html/templates/signup/confirmed.tpl

@@ -1,2 +0,0 @@
-<h2>Thanks!</h2>
-