From: GitHub <no...@gi...> - 2013-01-31 02:43:26
|
Branch: refs/heads/master Home: https://github.com/gallery/gallery3 Commit: 71cf911649811666919d040e2fc319f485b99966 https://github.com/gallery/gallery3/commit/71cf911649811666919d040e2fc319f485b99966 Author: Bharat Mediratta <bh...@me...> 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 <bh...@me...> 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. Compare: https://github.com/gallery/gallery3/compare/fc82f56f4b3c...8d15e5cb2eed |