Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-13-10-47

Conflicts:
	CRM/Core/Payment.php

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index 7993fd4ecb185cf47cd21fc2ce02717084393fc1..9d143ea7ba3b64de517973b6f87c232825fbb896 100644 (file)
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -355,15 +355,13 @@ abstract class CRM_Core_Payment {
       case 'cancel' :
         $url = 'civicrm/contribute/unsubscribe';
         break;
-
       case 'billing' :
         //in notify mode don't return the update billing url
-        if ($this->_paymentProcessor['billing_mode'] == self::BILLING_MODE_NOTIFY) {
+        if (!$this->isSupported('updateSubscriptionBillingInfo')) {
           return NULL;
         }
-       $url = 'civicrm/contribute/updatebilling';
+        $url = 'civicrm/contribute/updatebilling';
         break;
-
       case 'update' :
         $url = 'civicrm/contribute/updaterecur';
         break;