diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-12 11:23:57 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-12 11:23:57 +0100 |
| commit | b16aeeccff8de5fd579d79a48740df7a3e34e7bc (patch) | |
| tree | bb2ddcb29c6a465d73a3010437bdd076d11360c9 /misc/freeswitch/scripts/configuration.lua | |
| parent | 3c5a0511d228fb3dc00ae860ade1b8ff032cc42f (diff) | |
| parent | 40b2feb99d75074319f371087c521df198527266 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'misc/freeswitch/scripts/configuration.lua')
| -rw-r--r-- | misc/freeswitch/scripts/configuration.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/freeswitch/scripts/configuration.lua b/misc/freeswitch/scripts/configuration.lua index be83ef5..8672f99 100644 --- a/misc/freeswitch/scripts/configuration.lua +++ b/misc/freeswitch/scripts/configuration.lua @@ -196,7 +196,7 @@ function conf_conference(database) if conf_name then require 'common.conference' - conference = common.conference.Conference:new{log=log, database=database}:find_by_id(conf_name); + conference = common.conference.Conference:new{log=log, database=database}:find_by_id(common.str.to_i(conf_name)); if conference then log:debug('CONFIG_CONFERENCE ', conf_name, ' name: ', conference.record.name, ', profile: ', profile_name); config.parameters['caller-id-name'] = conference.record.name or ''; |