Merge remote-tracking branch 'origin/abtest' into master-abtest

[civicrm-core.git] / CRM / Price / Form / Set.php

diff --git a/CRM/Price/Form/Set.php b/CRM/Price/Form/Set.php
index 084a02d270e5badbcb451eea12e0ae8ed4111733..e0f8e431b24527a63056e5e855d36bbdbae40982 100644 (file)
--- a/CRM/Price/Form/Set.php
+++ b/CRM/Price/Form/Set.php
@@ -287,7 +287,9 @@ class CRM_Price_Form_Set extends CRM_Core_Form {
       CRM_Core_Session::setStatus(ts('The Set \'%1\' has been saved.', array(1 => $set->title)), ts('Saved'), 'success');
     }
     else {
-      $url = CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=add&sid=' . $set->id);
+      // Jump directly to adding a field if popups are disabled
+      $action = CRM_Core_Resources::singleton()->ajaxPopupsEnabled ? 'browse' : 'add';
+      $url = CRM_Utils_System::url('civicrm/admin/price/field', array('reset' => 1, 'action' => $action, 'sid' => $set->id, 'new' => 1));
       CRM_Core_Session::setStatus(ts("Your Set '%1' has been added. You can add fields to this set now.",
           array(1 => $set->title)
         ), ts('Saved'), 'success');