diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-12-09 18:31:01 +0200 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-12-09 18:31:01 +0200 |
| commit | 3e2610ea83c60805d5e727df6509da6c49fd6c7b (patch) | |
| tree | 28638f7a1cd2e298587f4b3960caf409f7d2d2fa /system/libraries/ORM.php | |
| parent | 6aabab4b715ff8ac00cc667e9d0a40c9868410d8 (diff) | |
| parent | c3ef8921260db8e39b6d2a7b4708e3d19f35f8b5 (diff) | |
Merge remote branch 'gallery3/master'
Diffstat (limited to 'system/libraries/ORM.php')
| -rw-r--r-- | system/libraries/ORM.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php index 4dd2eaf0..eb34221c 100644 --- a/system/libraries/ORM.php +++ b/system/libraries/ORM.php @@ -1002,7 +1002,11 @@ class ORM_Core { */ public function reload() { - return $this->find($this->object[$this->primary_key]); + if ($this->_loaded) { + return $this->find($this->object[$this->primary_key]); + } else { + return $this->clear(); + } } /** |