diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-02-05 13:02:56 -0500 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-02-05 13:02:56 -0500 |
| commit | 428d4f319bf9d6b5d16c90d847d61f70964e6e26 (patch) | |
| tree | 8d78dfa8ceecf2dec2cb056432ee575b154f766c | |
| parent | c4b2f79a677e38a9af87827ad2e753275eb37f6b (diff) | |
| parent | 8739e58348c354eb155af21620f38598b793a33f (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/gallery/tests/Item_Model_Test.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.build_number b/.build_number index 5f471925..775fa307 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=324 +build_number=326 diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php index 41361b32..35b865c4 100644 --- a/modules/gallery/tests/Item_Model_Test.php +++ b/modules/gallery/tests/Item_Model_Test.php @@ -464,10 +464,9 @@ class Item_Model_Test extends Gallery_Unit_Test_Case { preg_match("|http://./var/albums/name_\w+\.jpg\?m=\d+|", $photo->file_url()), $photo->file_url() . " is malformed"); - // Albums have special thumbnails. Empty album has cachebuster of 0 since it has no thumbnail $album = test::random_album(); $this->assert_true( - preg_match("|http://./var/thumbs/name_\w+/\.album\.jpg\?m=0|", $album->thumb_url()), + preg_match("|http://./var/thumbs/name_\w+/\.album\.jpg\?m=\d+|", $album->thumb_url()), $album->thumb_url() . " is malformed"); $photo = test::random_photo($album); |