X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FOptionGroup.php;h=250c93cff309723831aec292d907c1066d97aec0;hb=7c990617d04cdb233309f428d94e4be3bf3b57e3;hp=1227803a5fbeb173d2898a5d63ec81e80e4e0118;hpb=cb4100bc439690c0cd4840286377d1de7cbaf345;p=civicrm-core.git diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php index 1227803a5f..250c93cff3 100644 --- a/CRM/Core/OptionGroup.php +++ b/CRM/Core/OptionGroup.php @@ -342,6 +342,7 @@ WHERE v.option_group_id = g.id * @return null */ public static function getLabel($groupName, $value, $onlyActiveValue = TRUE) { + Civi::log()->warning('Deprecated function, use CRM_Core_PseudoConstant::getLabel', array('civi.tag' => 'deprecated')); if (empty($groupName) || empty($value) ) { @@ -395,6 +396,8 @@ WHERE v.option_group_id = g.id return NULL; } + Civi::log()->warning('Deprecated function, use CRM_Core_PseudoConstant::getKey', array('civi.tag' => 'deprecated')); + $query = " SELECT v.label as label ,v.{$valueField} as value FROM civicrm_option_value v, @@ -673,6 +676,12 @@ WHERE v.option_group_id = g.id ); } + /** + * Flush all the places where option values are cached. + * + * Note that this is called from CRM_Core_PseudoConstant::flush() so we should resist + * the intuitive urge to flush that class. + */ public static function flushAll() { self::$_values = array(); self::$_cache = array();