[Tickets #12970] Re: Don't override sticky OPTIONS values with default values.

[noreply at bugs.horde.org]

DO NOT REPLY TO THIS MESSAGE. THIS EMAIL ADDRESS IS NOT MONITORED.

Ticket URL: https://bugs.horde.org/ticket/12970
------------------------------------------------------------------------------
  Ticket             | 12970
  Updated By         | Git Commit <commits at lists.horde.org>
  Summary            | Don't override sticky OPTIONS values with default
                     | values.
  Queue              | Horde Framework Packages
  Version            | Git master
  Type               | Bug
  State              | Assigned
  Priority           | 1. Low
  Milestone          |
  Patch              |
  Owners             | Michael Rubinsky
------------------------------------------------------------------------------


Git Commit <commits at lists.horde.org> (2014-10-29 23:29) wrote:

Changes have been made in Git (master):

commit b5fc1d2b2af1132651cd20856c91c5788e8cd42a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 29 19:27:25 2014 -0400

     Revert "Bug: 12970  Don't overwrite sticky OPTIONS."

     This reverts commit 3902eb2f42197aea6d291816ae204711ff96edb7.

     Conflicts:
     	framework/ActiveSync/lib/Horde/ActiveSync/Collections.php

  .../lib/Horde/ActiveSync/Collections.php           |   24  
+++++---------------
  .../lib/Horde/ActiveSync/Request/Sync.php          |    5 ----
  2 files changed, 6 insertions(+), 23 deletions(-)

http://github.com/horde/horde/commit/b5fc1d2b2af1132651cd20856c91c5788e8cd42a