From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 16 Sep 2015 18:20:57 +0000 (-0500)
Subject: FS-8172 #resolve [Regression from earlier commit to mod_conference breaks admin contr... 
X-Git-Tag: v1.6.2~1^2~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3091301e34d2aa8b87fb5726607accb3016e3d3d;p=thirdparty%2Ffreeswitch.git

FS-8172 #resolve [Regression from earlier commit to mod_conference breaks admin controls in verto demo app]
---

diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c
index f4bfbb65a2..dd0e4f2a56 100644
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@ -922,23 +922,25 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
 			member->status_field = cJSON_CreateString("");
 			cJSON_AddItemToArray(member->json, member->status_field);
 
-			switch_channel_get_variables(member->channel, &var_event);
+			if (conference_utils_test_flag(member->conference, CFLAG_JSON_STATUS)) {
+				switch_channel_get_variables(member->channel, &var_event);
 
-			dvars = cJSON_CreateObject();
+				dvars = cJSON_CreateObject();
 
-			for (hi = var_event->headers; hi; hi = hi->next) {
-				if (!strncasecmp(hi->name, "verto_dvar_", 11)) {
-					char *var = hi->name + 11;
-
-					if (var) {
-						cJSON_AddItemToObject(dvars, var, cJSON_CreateString(hi->value));
+				for (hi = var_event->headers; hi; hi = hi->next) {
+					if (!strncasecmp(hi->name, "verto_dvar_", 11)) {
+						char *var = hi->name + 11;
+						
+						if (var) {
+							cJSON_AddItemToObject(dvars, var, cJSON_CreateString(hi->value));
+						}
 					}
 				}
-			}
 
-			cJSON_AddItemToArray(member->json, dvars);
+				cJSON_AddItemToArray(member->json, dvars);
 
-			switch_event_destroy(&var_event);
+				switch_event_destroy(&var_event);
+			}
 
 			cJSON_AddItemToArray(member->json, cJSON_CreateNull());