Merge pull request #22992 from eileenmcnaughton/billingnot

[civicrm-core.git] / CRM / Core / SelectValues.php

diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index c591954617d462cddebc520b9a645f489e7f727b..6f309fedd5703cd2d4487f2514fd593a579d559f 100644 (file)
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -1176,22 +1176,21 @@ class CRM_Core_SelectValues {
     ];
   }
 
-  public static function timezone() {
-    $tzlist = &Civi::$statics[__CLASS__]['tzlist'];
-
-    if (is_null($tzlist)) {
-      $tzlist = [];
-      foreach (timezone_identifiers_list() as $tz) {
-        // Actual timezone keys for PHP are mapped to human parts.
-        $tzlist[$tz] = str_replace('_', ' ', $tz);
-      }
-
-      // Add 'Etc/UTC' specially, as timezone_identifiers_list() does
-      // not include it, but it is the IANA long name for 'UTC'
-      $tzlist['Etc/UTC'] = ts('Etc/UTC');
-    }
-
-    return $tzlist;
+  /**
+   * Columns from the option_value table which may or may not be used by each option_group.
+   *
+   * Note: Value is not listed here as it is not optional.
+   *
+   * @return string[]
+   */
+  public static function optionValueFields() {
+    return [
+      'name' => 'name',
+      'label' => 'label',
+      'description' => 'description',
+      'icon' => 'icon',
+      'color' => 'color',
+    ];
   }
 
 }