瀏覽代碼

Merge pull request #672 from pulse00/master

Removed $this->loaded check
Thomas 13 年之前
父節點
當前提交
7dcd444163
共有 1 個文件被更改,包括 0 次插入8 次删除
  1. 0 8
      Form/ChoiceList/ModelChoiceList.php

+ 0 - 8
Form/ChoiceList/ModelChoiceList.php

@@ -162,10 +162,6 @@ class ModelChoiceList extends SimpleChoiceList
      */
     public function getEntities()
     {
-        if (!$this->loaded) {
-            $this->load();
-        }
-
         return $this->entities;
     }
 
@@ -186,10 +182,6 @@ class ModelChoiceList extends SimpleChoiceList
      */
     public function getEntity($key)
     {
-        if (!$this->loaded) {
-            $this->load();
-        }
-
         if (count($this->identifier) > 1) {
             // $key is a collection index
             $entities = $this->getEntities();