Adding revision 169794 to 1.4 since 1.4 is also affected by the issue

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

diff --git a/main/say.c b/main/say.c
index b6b973ccd753be82bc30195a274238add6d07942..d285e8214700414cb02977643e940e20f8a348d1 100644 (file)
--- a/main/say.c
+++ b/main/say.c
@@ -2216,11 +2216,6 @@ static int ast_say_number_full_tw(struct ast_channel *chan, int num, const char
                                        num -= ((num / 100) * 100);
                                } else if (num < 10000){
                                        snprintf(buf, 10, "%d", num);
-                                       if (last_length - strlen(buf) > 1 && last_length != 0 && last_length % strlen(buf) > 0) {
-                                               last_length = strlen(buf);
-                                               playz++;
-                                               continue;
-                                       }
                                        snprintf(fn, sizeof(fn), "digits/%d", (num / 1000));
                                        playt++;
                                        snprintf(buf, 10, "%d", num);
@@ -2231,9 +2226,6 @@ static int ast_say_number_full_tw(struct ast_channel *chan, int num, const char
                                                res = ast_say_number_full_tw(chan, num / 10000, ints, language, audiofd, ctrlfd);
                                                if (res)
                                                        return res;
-                                               if (((num / 10000) % (num/100000)) == 0)
-                                                       playz++;
-
                                                snprintf(buf, 10, "%d", num);
                                                ast_log(LOG_DEBUG, "Number '%d' %d %d\n", num, (int)strlen(buf), last_length);
                                                num -= ((num / 10000) * 10000);