Stop using MY_ORM::original(). It's got very odd semantics and we are

not capturing all cases for setting and resetting $original, which
leads to some weird and hard to reproduce behavior.

Instead, if we need the original just reload it from the database.
This may result in a somewhat excessive load in places, but we'll have
to fix that in a later optimization pass.

1 files changed, 1 insertions, 0 deletions

diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 9ea74b16..efad660e 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -139,6 +139,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
 
     try {
       $item->name = $item2->name;
+      print "SAVE\n";
       $item->save();
     } catch (ORM_Validation_Exception $e) {
       $this->assert_true(in_array("conflict", $e->validation->errors()));