Merge pull request #2036 from agh1/no-amounts-member-priceset

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

diff --git a/CRM/Price/Page/Set.php b/CRM/Price/Page/Set.php
index c233468a278d28f37cf2183b21c142175040da60..a0a7c9cbdd208c96cc492bd1f6e1ddd3b3d102a1 100644 (file)
--- a/CRM/Price/Page/Set.php
+++ b/CRM/Price/Page/Set.php
@@ -276,8 +276,13 @@ class CRM_Price_Page_Set extends CRM_Core_Page {
         CRM_Utils_Array::value('extends', $priceSet[$dao->id])
       );
       $extends = array();
-      foreach ($compIds as $compId) $extends[] = $comps[CRM_Core_Component::getComponentName($compId)];
-      $priceSet[$dao->id]['extends'] = implode(', ', $extends);
+      //CRM-10225
+      foreach ($compIds as $compId) {
+        if (!empty($comps[CRM_Core_Component::getComponentName($compId)])) {
+          $extends[] = $comps[CRM_Core_Component::getComponentName($compId)];
+        }
+      }
+     $priceSet[$dao->id]['extends'] = implode(', ', $extends);
 
       // form all action links
       $action = array_sum(array_keys($this->actionLinks()));
@@ -300,7 +305,12 @@ class CRM_Price_Page_Set extends CRM_Core_Page {
         $actionLinks[CRM_Core_Action::BROWSE]['name'] = 'View Price Fields';
       }
       $priceSet[$dao->id]['action'] = CRM_Core_Action::formLink($actionLinks, $action,
-        array('sid' => $dao->id)
+        array('sid' => $dao->id),
+        ts('more'),
+        FALSE,
+        'priceSet.row.actions',
+        'PriceSet',
+        $dao->id
       );
     }
     $this->assign('rows', $priceSet);