提交 3091301e authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-8172 #resolve [Regression from earlier commit to mod_conference breaks admin…

FS-8172 #resolve [Regression from earlier commit to mod_conference breaks admin controls in verto demo app]
上级 8bdf956c
...@@ -922,23 +922,25 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m ...@@ -922,23 +922,25 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m
member->status_field = cJSON_CreateString(""); member->status_field = cJSON_CreateString("");
cJSON_AddItemToArray(member->json, member->status_field); 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) { for (hi = var_event->headers; hi; hi = hi->next) {
if (!strncasecmp(hi->name, "verto_dvar_", 11)) { if (!strncasecmp(hi->name, "verto_dvar_", 11)) {
char *var = hi->name + 11; char *var = hi->name + 11;
if (var) { if (var) {
cJSON_AddItemToObject(dvars, var, cJSON_CreateString(hi->value)); 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()); cJSON_AddItemToArray(member->json, cJSON_CreateNull());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论