fixing getEnumValues()
This commit is contained in:
parent
b7cac8cb4e
commit
9a45b64391
@ -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
|
|||||||
*/
|
*/
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user