CRM-15603 - Standardize case of 'Proximity Search'

[civicrm-core.git] / CRM / UF / Form / Group.php

diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php
index ed56a0c26ae67d44603017986df94f8ea81c57a1..112c1d0a4951b902388d655027b7bacfd6b8b0b2 100644 (file)
--- a/CRM/UF/Form/Group.php
+++ b/CRM/UF/Form/Group.php
@@ -368,7 +368,9 @@ class CRM_UF_Form_Group extends CRM_Core_Form {
         CRM_Core_Session::setStatus(ts("Your CiviCRM Profile '%1' has been saved.", array(1 => $ufGroup->title)), ts('Profile Saved'), 'success');
       }
       else {
-        $url = CRM_Utils_System::url('civicrm/admin/uf/group/field/add', 'reset=1&action=add&gid=' . $ufGroup->id);
+        // Jump directly to adding a field if popups are disabled
+        $action = CRM_Core_Resources::singleton()->ajaxPopupsEnabled ? '' : '/add';
+        $url = CRM_Utils_System::url("civicrm/admin/uf/group/field$action", 'reset=1&new=1&gid=' . $ufGroup->id . '&action=' . ($action ? 'add' : 'browse'));
         CRM_Core_Session::setStatus(ts('Your CiviCRM Profile \'%1\' has been added. You can add fields to this profile now.',
             array(1 => $ufGroup->title)
           ), ts('Profile Added'), 'success');