summaryrefslogtreecommitdiff
path: root/modules/gallery/libraries
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-07-17 16:58:15 -0700
committerBharat Mediratta <bharat@menalto.com>2009-07-17 16:58:15 -0700
commitbb981bb7b60d6b0155b73bbb37edb25f2f207ec0 (patch)
treeb4dd91a42f3da07fae42c64aeb3d49f46e6ebc6a /modules/gallery/libraries
parente7c6861507ea7ca01d3d4ed7b4189c030c8d07b3 (diff)
parentcd907c2b42f8b50ebe6d490aab42365e16deb258 (diff)
Merge branch 'master' of git@github.com:/gallery/gallery3
Diffstat (limited to 'modules/gallery/libraries')
-rw-r--r--modules/gallery/libraries/MY_ORM.php2
-rw-r--r--modules/gallery/libraries/ORM_MPTT.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 319cbe09..1d3c1ef3 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -32,7 +32,7 @@ class ORM extends ORM_Core {
}
public function save() {
- model_cache::clear($this->object_name, $this->{$this->primary_key}, $this->primary_key);
+ model_cache::clear();
$result = parent::save();
$this->original = $this->object;
return $result;
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 46280d95..e371f159 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -285,6 +285,7 @@ class ORM_MPTT_Core extends ORM {
// Lets reload to get the changes.
$this->reload();
+ $target->reload();
return $this;
}