From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Wed, 10 Jun 2015 06:04:41 +0000 (+0530)
Subject: CRM-16648 - Notice: Undefined index: label/description in CRM_Core_OptionGroup
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aa8cebd60a786c9355a8ec4ef9d5f38ceafc394e;p=civicrm-core.git

CRM-16648 - Notice: Undefined index: label/description in CRM_Core_OptionGroup
---

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 7770090bd2..c0c1101fbc 100644
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -631,12 +631,9 @@ WHERE  v.option_group_id = g.id
                  'description',
                ) as $fld) {
         $row[$fld] = $dao->$fld;
-      }
-    }
-
-    if ($localize) {
-      foreach (array('label', 'description') as $f) {
-        $row[$f] = ts($row[$f]);
+        if ($localize && in_array($fld, array('label', 'description'))) {
+          $row[$fld] = ts($row[$fld]);
+        }
       }
     }