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

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 7770090bd2bd7a72af7db7dd5be9af361664e53b..c0c1101fbc4a3966bdcbaf72de55f48c8aeaca67 100644 (file)
--- 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]);
+        }
       }
     }