Blocked revisions 151763 via svnmerge
authorTerry Wilson <twilson@digium.com>
Thu, 23 Oct 2008 16:09:25 +0000 (16:09 +0000)
committerTerry Wilson <twilson@digium.com>
Thu, 23 Oct 2008 16:09:25 +0000 (16:09 +0000)
commitcee9678d82a9b9ac1f377d08f63ab0d7d8a735de
tree6b51070c7832f0791d6ffaf4861314bfc40dfe1d
parent154f9deed22d647562049a006732fd483a4141ce
Blocked revisions 151763 via svnmerge

........
  r151763 | twilson | 2008-10-23 11:04:42 -0500 (Thu, 23 Oct 2008) | 9 lines

  Backport fix from 1.6.0 that allows you to set parkedcalltransfers=no|caller|callee|both, but default to both which would be the equivalent of the existing behaviour.

  The problem was that if someone parked a call, the callee and caller would both get assigned the builtin transfer feature, which would not only be potentially giving someone the ability to transfer themselves when they shouldn't have it, but would also dissallow reinviting the media off of the call.
  (closes issue #12854)
   Reported by: davidw
   Patches:
         parkingfix4.diff.txt uploaded by otherwiseguy
     Tested by: davidw, otherwiseguy
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@151764 65c4cc65-6c06-0410-ace0-fbb531ad65f3