From c9e09c883c65ef1f6c8af66f7219a7da240ebbd9 Mon Sep 17 00:00:00 2001 From: tilghman Date: Fri, 17 Sep 2010 21:10:02 +0000 Subject: Merged revisions 287388 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r287388 | tilghman | 2010-09-17 16:08:54 -0500 (Fri, 17 Sep 2010) | 21 lines Merged revisions 287387 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r287387 | tilghman | 2010-09-17 16:08:00 -0500 (Fri, 17 Sep 2010) | 14 lines Merged revisions 287386 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r287386 | tilghman | 2010-09-17 16:06:03 -0500 (Fri, 17 Sep 2010) | 7 lines Blank columns should get set on reload, not ignored. (closes issue #16893) Reported by: haakon Patches: 20100818__issue16893.diff.txt uploaded by tilghman (license 14) ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@287389 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_queue.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/app_queue.c b/apps/app_queue.c index 07161d558..f44f2152a 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2114,10 +2114,10 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as } else tmp_name = v->name; - if (!ast_strlen_zero(v->value)) { - /* Don't want to try to set the option if the value is empty */ - queue_set_param(q, tmp_name, v->value, -1, 0); - } + /* NULL values don't get returned from realtime; blank values should + * still get set. If someone doesn't want a value to be set, they + * should set the realtime column to NULL, not blank. */ + queue_set_param(q, tmp_name, v->value, -1, 0); } /* Temporarily set realtime members dead so we can detect deleted ones. -- cgit v1.2.3