[gallery/gallery3] fc82f5: Automated update of .build_number to 314 for branc...

GitHub <noreply-9UaJU3cA/F/[email protected]> Wed, 30 Jan 2013 18:43:51 -0800
Newsgroups	gmane.comp.web.gallery.cvs
Message-ID	<[email protected]>
  Branch: refs/heads/3.0.x
  Home:   https://github.com/gallery/gallery3
  Commit: fc82f56f4b3c91ac1ceee426f477b256918636f8
      https://github.com/gallery/gallery3/commit/fc82f56f4b3c91ac1ceee426f477b256918636f8
  Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater-gXXrQ4p6DQJBDgjK7y7TUQ@public.gmane.org>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Automated update of .build_number to 314 for branch master
Last update: 12ea6ad642c0e84fe67f1324f8fa00c9534e7aa5 (3 commits ago)


  Commit: 71cf911649811666919d040e2fc319f485b99966
      https://github.com/gallery/gallery3/commit/71cf911649811666919d040e2fc319f485b99966
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M modules/gallery/libraries/ORM_MPTT.php

  Log Message:
  -----------
  Support additional where tuples in ORM_MPTT::parents.  Fixes #1980.


  Commit: 8d15e5cb2eed56bbd894ff5578d081deee8ca255
      https://github.com/gallery/gallery3/commit/8d15e5cb2eed56bbd894ff5578d081deee8ca255
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

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

  Log Message:
  -----------
  Follow-in to cff1e76e8da2055f9faf7449222b43a686014b1c for #1978
Restrict which album cover ids we swap over to the hierarchy of the
current album, otherwise we can wind up in sticky situations with
hierarchical album cover chains.

Eg, you have a hierarchy like this:

root -> A1 -> A2 --> A3 -> P1
               A4 -> P2

P1 is the album cover for its entire hierarchy.  But then you
swap A2's album cover for A3 making this:

root -> A1 -> A2 +   A3 -> P1
           \-> A4 -> P2

Since A1, A2 and A3 all had P1 as their album cover item id.  Now
we're swapping it over to P2 but we want to leave P1 as A3's album
cover item id.  So only look at A4's hierarchy and ignore its peers.


  Commit: 72545003b78873989a23e2da6343afe3dee38acd
      https://github.com/gallery/gallery3/commit/72545003b78873989a23e2da6343afe3dee38acd
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M modules/gallery/helpers/item.php
    M modules/gallery/libraries/ORM_MPTT.php

  Log Message:
  -----------
  Merge branch 'master' into 3.0.x


Compare: https://github.com/gallery/gallery3/compare/9318f76a6837...72545003b788

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan

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