diff options
| author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
|---|---|---|
| committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-03-05 11:01:01 -0600 |
| commit | 4fcdd330139921b6fa5d4f9d15fb5f91775b27af (patch) | |
| tree | 62e82c385c9a804a8f32da6f276881ff8c21fc90 /misc/freeswitch/scripts/common/database.lua | |
| parent | 2b94b16ee1201d15b3b9d66e142df311141a47db (diff) | |
| parent | a865b1f9506b900ed8643c01d94c86268e907720 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'misc/freeswitch/scripts/common/database.lua')
| -rw-r--r-- | misc/freeswitch/scripts/common/database.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/freeswitch/scripts/common/database.lua b/misc/freeswitch/scripts/common/database.lua index 345f69d..8aed1ac 100644 --- a/misc/freeswitch/scripts/common/database.lua +++ b/misc/freeswitch/scripts/common/database.lua @@ -72,7 +72,7 @@ function Database.last_insert_id(self) end -function Database.insert_or_update(self, db_table, record, use_on_update) +function Database.insert_or_update(self, db_table, record, ignore_on_update) ignore_on_update = ignore_on_update or self.ignore_on_update; local record_sql_create = {}; local record_sql_update = {}; |