Skip to content

D
doctrine-dbal
Commit 9a45b643 authored by pookey's avatar pookey
Browse files
Options

fixing getEnumValues()

parent b7cac8cb
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
lib/Doctrine/Table.php
View file @ 9a45b643
...@@ -1171,8 +1171,8 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable ...@@ -1171,8 +1171,8 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
*/ */
final public function getEnumValues($field) final public function getEnumValues($field)
{ {
if (isset($this->options['enumMap'][$field])) { if (isset($this->columns[$field][2]['values'])) {
return $this->options['enumMap'][$field]; return $this->columns[$field][2]['values'];
} else { } else {
return array(); return array();
} }
...@@ -1200,11 +1200,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable ...@@ -1200,11 +1200,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
*/ */
public function enumIndex($field, $value) public function enumIndex($field, $value)
{ {
if ( ! isset($this->columns[$field][2]['values'])) { $values = $this->getEnumValues($field);
$values = array();
} else {
$values = $this->columns[$field][2]['values'];
}
return array_search($value, $values); return array_search($value, $values);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment