[gallery/gallery3] 0312d1: #1994 - Make get_file_metadata throw an exception ...

  Branch: refs/heads/master
  Home:   https://github.com/gallery/gallery3
  Commit: 0312d1b071bd4434ddb3f82888b0323da6bf3732
      https://github.com/gallery/gallery3/commit/0312d1b071bd4434ddb3f82888b0323da6bf3732
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-02-08 (Fri, 08 Feb 2013)

  Changed paths:
    M modules/gallery/helpers/gallery_graphics.php
    M modules/gallery/helpers/graphics.php
    M modules/gallery/helpers/movie.php
    M modules/gallery/helpers/photo.php
    M modules/gallery/models/item.php
    M modules/gallery/tests/Item_Model_Test.php
    M modules/gallery/tests/Movie_Helper_Test.php
    M modules/gallery/tests/Photo_Helper_Test.php
    M modules/watermark/controllers/admin_watermarks.php

  Log Message:
  -----------
  #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.


  Commit: 7613d886f98299c36d667908c52401bd07eef1e0
      https://github.com/gallery/gallery3/commit/7613d886f98299c36d667908c52401bd07eef1e0
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-02-09 (Sat, 09 Feb 2013)

  Changed paths:
    M modules/gallery/helpers/gallery_graphics.php
    M modules/gallery/helpers/graphics.php
    M modules/gallery/helpers/movie.php
    M modules/gallery/helpers/photo.php
    M modules/gallery/models/item.php
    M modules/gallery/tests/Item_Model_Test.php
    M modules/gallery/tests/Movie_Helper_Test.php
    M modules/gallery/tests/Photo_Helper_Test.php
    M modules/watermark/controllers/admin_watermarks.php

  Log Message:
  -----------
  Merge pull request #128 from shadlaws/fix_1994

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


Compare: https://github.com/gallery/gallery3/compare/f4ecb7e65850...7613d886f982

------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb

__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]