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.
#1994 - Make get_file_metadata throw an exception if photo or movie is unidentifiable/illegal.
- photo & movie helpers: modified to throw exceptions when file is known to be unidentifiable/illegal.
- item model: revised to work with exceptions and be more explicit when the data file is invalid.
- item model: removed duplicate get_file_metadata call for updated items.
- admin_watermarks controller: revised to work with exceptions (really cleans up logic here).
- graphics helper: revised to handle invalid placeholders (a nearly-impossible corner case, but still...).
- photo & movie helper tests: revised to work with exceptions, added new tests for illegal files with valid extensions.
- item model tests: revised to work with exceptions, added new tests for illegal files with valid extensions.
#1996 - Add blacklist to legal_file helper.
Adding a blacklist to legal_file could prevent possible security holes arising
from a contributed module that adds file types by user input (e.g. an admin screen).
Merge pull request #127 from shadlaws/fix_1993

#1993 - Remove "failed" query string from upgrader redirect if there are no errors.
Automated update of .build_number to 332 for branch master
Last update: 40c5cba2dccdb217bd93274f65d16fd5558257fe (1 commits ago)
#1997 - Update movie dimensions and mime type if previously set without FFmpeg.
- Added code to check/correct movie width, height, and mime in graphics::generate.
As the comment says in the commit, this isn't ideal, but doing it in an upgrade
script wouldn't be very ideal either.
Merge pull request #128 from shadlaws/fix_1994

#1994 - Make get_file_metadata throw an exception if photo or movie is unidentifiable/illegal.