From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 23 Jul 2015 08:50:57 +0000 (+1200)
Subject: Update reset for update situation
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=057e71340a639ebff82f96b76c6028d152f059c5;p=civicrm-core.git

Update reset for update situation
---

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index f608afdc36..2ffa5de1e1 100644
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -580,6 +580,10 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
     static $options = array();
     if ($reset) {
       $options = array();
+      // This would happen if the function was only called to clear the cache.
+      if (empty($fieldId)) {
+        return array();
+      }
     }
 
     if (empty($options[$fieldId])) {