dev/core#117 Replace deprecated each with foreach in CRM/Activity/BAO/Query.php

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 79e36aec007b8a643d42dc56ca20215eb63e5075..724a30642a649e3ec93152d0628759fdb83c63da 100644 (file)
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -318,8 +318,8 @@ class CRM_Activity_BAO_Query {
 
       case 'activity_result':
         if (is_array($value)) {
-          $safe = NULL;
-          while (list(, $k) = each($value)) {
+          $safe = [];
+          foreach ($values as $id => $k) {
             $safe[] = "'" . CRM_Utils_Type::escape($k, 'String') . "'";
           }
           $query->_where[$grouping][] = "civicrm_activity.result IN (" . implode(',', $safe) . ")";
@@ -505,7 +505,7 @@ class CRM_Activity_BAO_Query {
         if ($name) {
           $value = CRM_Core_OptionGroup::values($name);
           if (!empty($value)) {
-            while (list($k, $v) = each($value)) {
+            foreach ($value as $k => $v) {
               $resultOptions[$v] = $v;
             }
           }