[gallery/gallery3] 3c100d: #2074 - Mirror some additional file_proxy checks i...

----==_mimepart_51b808409a379_3719120fde07032
Date: Tue, 11 Jun 2013 22:33:52 -0700
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <51b808409c1a4_3719120fde070450-P8FJ25gi/wisHj0ehI8gLCqyDsTP4bNorxkAB0y/[email protected]>

  Branch: refs/heads/master
  Home:   https://github.com/gallery/gallery3
  Commit: 3c100d06ff10d12b1b6b960ba52c5206bac855c4
      https://github.com/gallery/gallery3/commit/3c100d06ff10d12b1b6b960ba52c5206bac855c4
  Author: shadlaws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M modules/gallery/helpers/data_rest.php

  Log Message:
  -----------
  #2074 - Mirror some additional file_proxy checks in data_rest.


  Commit: b024c07036b53b61a73c255447333686585315f5
      https://github.com/gallery/gallery3/commit/b024c07036b53b61a73c255447333686585315f5
  Author: Shad Laws <shad-xpYdmXCiSuZWk0Htik3J/[email protected]>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M modules/gallery/helpers/data_rest.php

  Log Message:
  -----------
  Merge pull request #396 from shadlaws/fix_2074_master

#2074 - Mirror some additional file_proxy checks in data_rest.


Compare: https://github.com/gallery/gallery3/compare/53d3fa81252f...b024c07036b5

----==_mimepart_51b808409a379_3719120fde07032
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
----==_mimepart_51b808409a379_3719120fde07032
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

__[ 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 ]
----==_mimepart_51b808409a379_3719120fde07032--