]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix Dynamic Hints Variable Substition - Underscore Problem
authorMichael L. Young <elgueromexicano@gmail.com>
Mon, 12 Nov 2012 20:15:27 +0000 (20:15 +0000)
committerMichael L. Young <elgueromexicano@gmail.com>
Mon, 12 Nov 2012 20:15:27 +0000 (20:15 +0000)
When adding a dynamic hint, if an extension contains an underscore no variable
subsitution is being performed.

This patch changes from checking if the extension contains an underscore to
checking if the extension begins with an underscore.

(closes issue ASTERISK-20639)
Reported by: Steven T. Wheeler
Tested by: Steven T. Wheeler, Michael L. Young
Patches:
  asterisk-20639-dynamic-hint-underscore.diff
                                     uploaded by Michael L. Young (license 5026)

Review: https://reviewboard.asterisk.org/r/2188/
........

Merged revisions 376142 from http://svn.asterisk.org/svn/asterisk/branches/1.8

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

main/pbx.c

index 1cfb8be9698b16067ecb8f7c46169ac6165a0b9f..3557948bd905063cb34321dd1c0e9dd43d7e5e8b 100644 (file)
@@ -8681,7 +8681,7 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
        }
 
        /* If we are adding a hint evalulate in variables and global variables */
-       if (priority == PRIORITY_HINT && strstr(application, "${") && !strstr(extension, "_")) {
+       if (priority == PRIORITY_HINT && strstr(application, "${") && extension[0] != '_') {
                struct ast_channel *c = ast_dummy_channel_alloc();
 
                if (c) {