[freeside-commits] branch master updated. ef644359f646efb69ecb4c74d55fee05107dad11

[Ivan]

The branch, master has been updated
       via  ef644359f646efb69ecb4c74d55fee05107dad11 (commit)
       via  825e0f0fdb1fb45c8b9523e795da816773f04295 (commit)
      from  452da5c4005c7dccc504db38578b9af2227d6e15 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ef644359f646efb69ecb4c74d55fee05107dad11
Merge: 825e0f0 452da5c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Dec 20 12:06:26 2012 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 825e0f0fdb1fb45c8b9523e795da816773f04295
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Dec 20 12:06:13 2012 -0800

    fix "Use of implicit split to @_ is deprecated" warning, RT#20731, RT#20706

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 84b00e9..aae51e9 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -481,8 +481,8 @@ sub check_chargable {
 
   return "carrierid NOT IN ( ". $self->option_cacheable('use_carrierid'). " )"
     if $self->option_cacheable('use_carrierid') =~ /\S/
-    && !grep { $cdr->carrierid eq $_ } split(/\s*,\s*/, $self->option_cacheable('use_carrierid')) #eq otherwise 0 matches ''
-    && ! $flags{'da_rewrote'};
+    && ! $flags{'da_rewrote'} #why?
+    && !grep { $cdr->carrierid eq $_ } split(/\s*,\s*/, $self->option_cacheable('use_carrierid')); #eq otherwise 0 matches ''
 
   # unlike everything else, use_cdrtypenum is applied in FS::svc_x::get_cdrs.
   return "cdrtypenum != ". $self->option_cacheable('use_cdrtypenum')

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_pkg/voip_cdr.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)