aboutsummaryrefslogtreecommitdiffstats
path: root/main/features.c
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-09 19:53:28 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-09 19:53:28 +0000
commit6891505c780181df72d7fa19f920d1d909eb71aa (patch)
tree6c2321527d6d23d134ef2718e8279005fdc6ed6b /main/features.c
parent25b5f5b525b5388b1153c916d5ab0d3b254146c7 (diff)
Merged revisions 307228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r307228 | jpeeler | 2011-02-09 13:52:51 -0600 (Wed, 09 Feb 2011) | 17 lines Merged revisions 307227 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r307227 | jpeeler | 2011-02-09 13:52:12 -0600 (Wed, 09 Feb 2011) | 11 lines Make sure to set parking dial context for non-default parking lots. Since parking_con_dial isn't settable, set all parking lots to "park-dial". (closes issue #17946) Reported by: bluecrow76 Patches: asterisk-1.8.0-beta4-multipark-fixes-2010SEP02.diff uploaded by bluecrow76 (license 270) modified by me ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@307229 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c
index d22416226..f9e024850 100644
--- a/main/features.c
+++ b/main/features.c
@@ -4715,9 +4715,9 @@ static struct ast_parkinglot *build_parkinglot(char *name, struct ast_variable *
if (!var) { /* Default parking lot */
ast_copy_string(parkinglot->parking_con, "parkedcalls", sizeof(parkinglot->parking_con));
- ast_copy_string(parkinglot->parking_con_dial, "park-dial", sizeof(parkinglot->parking_con_dial));
ast_copy_string(parkinglot->mohclass, "default", sizeof(parkinglot->mohclass));
}
+ ast_copy_string(parkinglot->parking_con_dial, "park-dial", sizeof(parkinglot->parking_con_dial));
/* Check for errors */
if (ast_strlen_zero(parkinglot->parking_con)) {