Index: branches/RC/core/kernel/kbase.php =================================================================== diff -u -r11271 -r11495 --- branches/RC/core/kernel/kbase.php (.../kbase.php) (revision 11271) +++ branches/RC/core/kernel/kbase.php (.../kbase.php) (revision 11495) @@ -503,7 +503,12 @@ function GetFieldOptions($field) { if (isset($this->Fields[$field])) { - $this->PrepareFieldOptions($field); + $options_prepared = array_key_exists('options_prepared', $this->Fields[$field]) ? $this->Fields[$field]['options_prepared'] : false; + if (!$options_prepared) { + $this->PrepareFieldOptions($field); + $this->Fields[$field]['options_prepared'] = true; + } + return $this->Fields[$field]; } else {