[Gallery-checkins] [gallery/gallery3] 1cf50c: Fix up lock and unlock query code.

[GitHub <no...@gi...>]

  Branch: refs/heads/kohana_3
  Home:   https://github.com/gallery/gallery3
  Commit: 1cf50ce4c2706c0b0b5e4f8699ee0f0b04f194e9
      https://github.com/gallery/gallery3/commit/1cf50ce4c2706c0b0b5e4f8699ee0f0b04f194e9
  Author: Bharat Mediratta <bh...@me...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M modules/gallery/classes/Gallery/ORM/MPTT.php

  Log Message:
  -----------
  Fix up lock and unlock query code.


  Commit: b2bcb234683adb5ea46a17f4f9aabf861138190d
      https://github.com/gallery/gallery3/commit/b2bcb234683adb5ea46a17f4f9aabf861138190d
  Author: Bharat Mediratta <bh...@me...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M modules/gallery/classes/Gallery/Item.php

  Log Message:
  -----------
  Fix get_max_weight() query to default to returning an object.


  Commit: ec0bc48751c9035720a35ebe472022c926eb35ba
      https://github.com/gallery/gallery3/commit/ec0bc48751c9035720a35ebe472022c926eb35ba
  Author: Bharat Mediratta <bh...@me...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M modules/gallery/classes/Gallery/Model/Item.php

  Log Message:
  -----------
  - Fix DB::select() syntax in _build_relative_caches()  (if you use an array it considers them to be aliases)
- Convert some queries to return objects
- Tweak flow layout slightly in save()
- Drop original_values from valid_field callback - sort_column doesn't need it, I was wrong about that.
- Switch from "decimal" to a regex since the decimal callback is overly constrictive about the number of digits to the right of the decimal
- DB::select doesn't have merge_where so inline that logic


  Commit: c72035f9dd42b25f4453b0d986bba94db1598af8
      https://github.com/gallery/gallery3/commit/c72035f9dd42b25f4453b0d986bba94db1598af8
  Author: Bharat Mediratta <bh...@me...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M modules/gallery/classes/Gallery/Access.php

  Log Message:
  -----------
  Also reload columns for Item and AccessCache models after adding/dropping columns.


  Commit: 467b2da6b21038e3ac89755b03abd5b99a24314e
      https://github.com/gallery/gallery3/commit/467b2da6b21038e3ac89755b03abd5b99a24314e
  Author: Bharat Mediratta <bh...@me...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M modules/gallery/tests/Access_Helper_Test.php

  Log Message:
  -----------
  Fix add/remove relationship calls to specific the alias.


  Commit: 95102fad429435d95f866b5c9bba6cd325f96708
      https://github.com/gallery/gallery3/commit/95102fad429435d95f866b5c9bba6cd325f96708
  Author: Bharat Mediratta <bh...@me...>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M modules/gallery/classes/Gallery/Access.php
    M modules/gallery/classes/Gallery/Auth.php
    M modules/server_add/classes/ServerAdd/Controller/ServerAdd.php
    M modules/tag/classes/Tag/Hook/TagBlock.php
    M modules/tag/tests/Tag_Test.php
    M modules/user/classes/User/Group.php
    M modules/user/classes/User/User.php

  Log Message:
  -----------
  Merge branch 'kohana_3' of github.com:gallery/gallery3 into kohana_3


Compare: https://github.com/gallery/gallery3/compare/9942e8b6501a...95102fad4294