diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
| commit | f50dbd992d6973caeaaa3139ddf5f908dd84ec79 (patch) | |
| tree | cbdb343de89306a4ed823dc5aa104a802f846dc4 /modules/gallery/tests/Photos_Controller_Test.php | |
| parent | 2e420522ece22942a9b3b6ee413ca0e1dfa76148 (diff) | |
| parent | dc67cf64813361b34c366123f37d88ef6988fcc8 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/rest.php
Diffstat (limited to 'modules/gallery/tests/Photos_Controller_Test.php')
| -rw-r--r-- | modules/gallery/tests/Photos_Controller_Test.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php index 624e6878..fa4f101a 100644 --- a/modules/gallery/tests/Photos_Controller_Test.php +++ b/modules/gallery/tests/Photos_Controller_Test.php @@ -44,7 +44,8 @@ class Photos_Controller_Test extends Unit_Test_Case { access::allow(identity::everybody(), "edit", $root); ob_start(); - $controller->_update($photo); + $controller->update($photo->id); + $photo->reload(); $results = ob_get_contents(); ob_end_clean(); |