Merge pull request #6618 from mallezie/crm-17106

[civicrm-core.git] / CRM / Utils / OpenFlashChart.php

diff --git a/CRM/Utils/OpenFlashChart.php b/CRM/Utils/OpenFlashChart.php
index 63173bae52e50a2543f916a90a40acfd5b40c2d9..6e242383212766d2ec6009d9863ec1cf6a0a1535 100644 (file)
--- a/CRM/Utils/OpenFlashChart.php
+++ b/CRM/Utils/OpenFlashChart.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -271,8 +271,8 @@ class CRM_Utils_OpenFlashChart {
     // $params['values'] should contains the values for each
     // criteria defined in $params['criteria']
     $values = CRM_Utils_Array::value('values', $params);
-    $criterias = CRM_Utils_Array::value('criteria', $params);
-    if (!is_array($values) || empty($values) || !is_array($criterias) || empty($criterias)) {
+    $criteria = CRM_Utils_Array::value('criteria', $params);
+    if (!is_array($values) || empty($values) || !is_array($criteria) || empty($criteria)) {
       return $chart;
     }
 
@@ -285,7 +285,7 @@ class CRM_Utils_OpenFlashChart {
       }
 
       $xValueLabels[] = (string) $xVal;
-      foreach ($criterias as $criteria) {
+      foreach ($criteria as $criteria) {
         $xReferences[$criteria][$xVal] = (double) CRM_Utils_Array::value($criteria, $yVal, 0);
         $yValues[] = (double) CRM_Utils_Array::value($criteria, $yVal, 0);
       }
@@ -307,7 +307,7 @@ class CRM_Utils_OpenFlashChart {
     $count = 0;
     foreach ($xReferences as $criteria => $values) {
       $toolTipVal = $tooltip;
-      // for seperate tooltip for each criteria
+      // for separate tooltip for each criteria
       if (is_array($tooltip)) {
         $toolTipVal = CRM_Utils_Array::value($criteria, $tooltip, "$symbol #val#");
       }
@@ -316,7 +316,7 @@ class CRM_Utils_OpenFlashChart {
       $xValues[$count] = new bar_3d();
       // set colour pattel
       $xValues[$count]->set_colour(self::$_colours[$count]);
-      // define colur pattel with bar criterias
+      // define colur pattel with bar criteria
       $xValues[$count]->key((string) $criteria, 12);
       // define bar chart values
       $xValues[$count]->set_values(array_values($values));