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

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 10 insertions, 0 deletions

diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 615b8997..0940d076 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -140,4 +140,14 @@ class Item_Model_Test extends Unit_Test_Case {
     }
     $this->assert_false(true, "Item_Model::rename should not accept / characters");
   }
+
+  public function save_original_values_test() {
+    $item = $this->create_random_item();
+    $item->title = "ORIGINAL_VALUE";
+    $item->save();
+    $item->title = "NEW_VALUE";
+
+    $this->assert_same("ORIGINAL_VALUE", $item->original()->title);
+    $this->assert_same("NEW_VALUE", $item->title);
+  }
 }