diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-16 00:15:23 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-16 00:15:23 -0800 |
| commit | 434d351b2f0fc2a048f561665cb1d828d1126f9c (patch) | |
| tree | 12b23d33fecf0e5b053a79ed1bf3b8a604c98372 /modules/gallery/tests | |
| parent | 654b103355f1bda15246e651fa91f3c9e08c3901 (diff) | |
| parent | dcf4b5e71ae8a097f133a06485d60c5fb3400824 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/models/item.php
Diffstat (limited to 'modules/gallery/tests')
| -rw-r--r-- | modules/gallery/tests/Item_Model_Test.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php index c0ac4436..bf5fca1a 100644 --- a/modules/gallery/tests/Item_Model_Test.php +++ b/modules/gallery/tests/Item_Model_Test.php @@ -166,7 +166,6 @@ class Item_Model_Test extends Unit_Test_Case { $item = self::_create_random_item(); $item->title = "ORIGINAL_VALUE"; $item->save(); - $item->reload(false); $item->title = "NEW_VALUE"; $this->assert_same("ORIGINAL_VALUE", $item->original()->title); |