Merge pull request civicrm#260 from xurizaemon/7.x-4.6-CRM-16121

eileenmcnaughton · eileenmcnaughton · commit a417a2d3e603 · 2015-03-17T11:07:14.000+13:00
CRM-15030, CRM-16048. Reapply CRM-15030 which was reversed by CRM-16048.
diff --git a/modules/views/civicrm/civicrm_handler_field_custom.inc b/modules/views/civicrm/civicrm_handler_field_custom.inc
@@ -67,8 +67,8 @@ class civicrm_handler_field_custom extends views_handler_field {
       default:
         if (!is_null($value)) {
           // get the field id from the db
-          if (!empty($this->options['label'])) {
-            $customFieldID = CRM_Core_DAO::getFieldValue('CRM_Core_BAO_CustomField', $this->options['label'], 'id', 'label');
+          if (!empty($this->definition['title'])) {
+            $customFieldID = CRM_Core_DAO::getFieldValue('CRM_Core_BAO_CustomField', $this->definition['title'], 'id', 'label');
             require_once 'CRM/Core/BAO/CustomOption.php';
             return CRM_Core_BAO_CustomOption::getOptionLabel($customFieldID, $value);
           }
