diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-19 16:34:34 +0000 | 
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-19 16:34:34 +0000 | 
| commit | e47505081f2c1017a68f763e1170b44fddd1e722 (patch) | |
| tree | eb511a8d9bae266ed6cf86f789f270642af93e90 /modules/gallery/tests/Gallery_Rest_Helper_Test.php | |
| parent | 0a67b836a9b5021c91b9c327d3693991c3248dfc (diff) | |
| parent | 9384f987bb96d0d39787ff9d3d16a70c01cd76e0 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')
| -rw-r--r-- | modules/gallery/tests/Gallery_Rest_Helper_Test.php | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php index cd0aabae..f8cf6190 100644 --- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php +++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php @@ -94,8 +94,8 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {                                     "path" => $photo->relative_url(),                                     "thumb_url" => $photo->thumb_url(),                                     "thumb_dimensions" => array( -                                     "width" => $photo->thumb_width, -                                     "height" => $photo->thumb_height), +                                     "width" => (string)$photo->thumb_width, +                                     "height" => (string)$photo->thumb_height),                                     "has_thumb" => true,                                     "title" => $photo->title))))),        gallery_rest::get($request)); @@ -115,14 +115,14 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {                                "parent_path" => $child->relative_url(),                                "title" => $photo->title,                                "thumb_url" => $photo->thumb_url(), -                              "thumb_size" => array("height" => $photo->thumb_height, -                                                    "width" => $photo->thumb_width), +                              "thumb_size" => array("height" => (string)$photo->thumb_height, +                                                    "width" => (string)$photo->thumb_width),                                "resize_url" => $photo->resize_url(),                                "resize_size" => array("height" => $photo->resize_height,                                                         "width" => $photo->resize_width),                                "url" => $photo->file_url(), -                              "size" => array("height" => $photo->height, -                                              "width" => $photo->width), +                              "size" => array("height" => (string)$photo->height, +                                              "width" => (string)$photo->width),                                "description" => $photo->description,                                "slug" => $photo->slug))),        gallery_rest::get($request));  | 
