Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 1 insertions, 33 deletions

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 198a430b..a158d853 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -18,41 +18,9 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class ORM extends ORM_Core {
-  // Track the original value of this ORM so that we can look it up in ORM::original()
-  protected $original = null;
-
   public function save() {
     model_cache::clear();
-    $result = parent::save();
-    $this->original = clone $this;
-    return $result;
-  }
-
-  public function __set($column, $value) {
-    if (!isset($this->original)) {
-      $this->original = clone $this;
-    }
-
-    if ($value instanceof SafeString) {
-      $value = $value->unescaped();
-    }
-
-    return parent::__set($column, $value);
-  }
-
-  public function __unset($column) {
-    if (!isset($this->original)) {
-      $this->original = clone $this;
-    }
-
-    return parent::__unset($column);
-  }
-
-  public function original() {
-    if (!isset($this->original)) {
-      $this->original = clone $this;
-    }
-    return $this->original;
+    return parent::save();
   }
 }