From: Sean Bright <sean@malleable.com>
Date: Wed, 19 Jan 2011 23:49:54 +0000 (+0000)
Subject: Merged revisions 302834 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1957
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59b2fbb9847f0162045a76a10e363350a8fe6e8b;p=thirdparty%2Fasterisk.git

Merged revisions 302834 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302834 | seanbright | 2011-01-19 18:49:00 -0500 (Wed, 19 Jan 2011) | 14 lines

  Merged revisions 302833 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302833 | seanbright | 2011-01-19 18:47:22 -0500 (Wed, 19 Jan 2011) | 7 lines

    Support greetingsfolder as documented in voicemail.conf.sample.

    (closes issue #17870)
    Reported by: edhorton
    Patches:
          __20100816-app_voicemail-greetingsfolder-support.txt uploaded by lmadsen (license 10)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 754bfa040c..ca473689b3 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -11698,6 +11698,9 @@ static int load_config(int reload)
 		}
 		if ((val = ast_variable_retrieve(cfg, "general", "greetingfolder"))) {
 			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
+		} else if ((val = ast_variable_retrieve(cfg, "general", "greetingsfolder"))) {
+			/* Also support greetingsfolder as documented in voicemail.conf.sample */
+			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
 		} else {
 			ast_copy_string(greetingfolder, imapfolder, sizeof(greetingfolder));
 		}