Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
- Fix unit test for album url since empty albums now have thumbnails.
Automated update of .build_number to 325 for branch master
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (3 commits ago)
Merge pull request #118 from shadlaws/fix_1982_followon

Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
Automated update of .build_number to 326 for branch master
Last update: 291059d86a5badb62360b88f5dccab4a07f47778 (1 commits ago)
Force a sort order no sibling checks.  Fixes #1990.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 327 for branch master
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (5 commits ago)
Follow-on to 949b8cda14ec037386da34c43248ebd60542f5da for #1982.
- Add extra condition to Item_Model_Test::urls_test to test cache busters of missing files.
- Previous commit fixes unit test for empty album url, but now no test checks missing files.
#1991 - Add options to graphics::mark_dirty to specify type and/or mime type.
- graphics::mark_dirty - added $type and $mime_type as options.
- graphics::mark_dirty - used options to set additional where conditions.
Merge pull request #122 from shadlaws/followon_1982_part_2

Follow-on to 949b8cda14ec037386da34c43248ebd60542f5da for #1982.
Automated update of .build_number to 328 for branch master
Last update: 1796a290c18a2e38c7714ac903c78ac54c373e6b (1 commits ago)
Merge pull request #124 from shadlaws/fix_1991

#1991 - Add options to graphics::mark_dirty to specify type and/or mime type
Automated update of .build_number to 329 for branch master
Last update: aed006a92e858cb9ca66dd021c07c5d80586169f (1 commits ago)
#1992 - Improve examples for thumb/resize/file path/url functions in item model.
Documentation-only changes to examples used in:
- Item_Model::url
- Item_Model::abs_url
- Item_Model::file_path
- Item_Model::file_url
- Item_Model::resize_path
- Item_Model::resize_url
- Item_Model::thumb_path
- Item_Model::thumb_url
Merge pull request #125 from shadlaws/fix_1992

#1992 - Improve examples for thumb/resize/file path/url functions in item model
Automated update of .build_number to 330 for branch master
Last update: 2fe80add2ed23516948c712cd899c03302c865fb (1 commits ago)
Follow-on to 1e4d75c12072b49c3469f18af13bcf3439afc6b0 for #1975.
Don't try to use an array index on a function return, that's not supported
in PHP 5.3
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 331 for branch master
Last update: 1796a290c18a2e38c7714ac903c78ac54c373e6b (2 commits ago)
#1993 - Remove "failed" query string from upgrader redirect if there are no errors.
- Changed redirect if it finished without failures.
- No change to Upgrader_Controller::index(), since its behavior with an empty vs. undefined failed query is identical.