Merge remote-tracking branch 'upstream/master' into pledge-batchentry

[civicrm-core.git] / CRM / UF / Page / Field.php

diff --git a/CRM/UF/Page/Field.php b/CRM/UF/Page/Field.php
index 148142be55ae5c814d8413b762a30538a771e053..32a549dedba23d2446d564ea6786082c27b0b25d 100644 (file)
--- a/CRM/UF/Page/Field.php
+++ b/CRM/UF/Page/Field.php
@@ -110,6 +110,11 @@ class CRM_UF_Page_Field extends CRM_Core_Page {
    * @static
    */
   function browse() {
+    $resourceManager = CRM_Core_Resources::singleton();
+    if (!empty($_GET['new']) && $resourceManager->ajaxPopupsEnabled) {
+      $resourceManager->addScriptFile('civicrm', 'js/crm.addNew.js', 999, 'html-header');
+    }
+
     $ufField = array();
     $ufFieldBAO = new CRM_Core_BAO_UFField();
 
@@ -199,7 +204,7 @@ class CRM_UF_Page_Field extends CRM_Core_Page {
   }
 
   /**
-   * edit CiviCRM Profile data.
+   * Edit CiviCRM Profile data.
    *
    * editing would involved modifying existing fields + adding data to new fields.
    *
@@ -278,7 +283,8 @@ class CRM_UF_Page_Field extends CRM_Core_Page {
   /**
    * Preview custom field
    *
-   * @param int $id custom field id
+   * @param int $fieldId custom field id
+   * @param int $groupId
    *
    * @return void
    * @access public