[freeside-commits] branch FREESIDE_3_BRANCH updated. 55a37d7100a678c2699e2bc42eb71c5b0420a1e1

Ivan ivan at 420.am
Wed Apr 6 19:21:56 PDT 2016


The branch, FREESIDE_3_BRANCH has been updated
       via  55a37d7100a678c2699e2bc42eb71c5b0420a1e1 (commit)
       via  864249a2b23248f86aa73dc355f470e7426b4de5 (commit)
      from  b3b2122053db54742ad6cb90d0d72e8a5d6b4296 (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 55a37d7100a678c2699e2bc42eb71c5b0420a1e1
Merge: 864249a b3b2122
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Apr 6 19:21:52 2016 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit 864249a2b23248f86aa73dc355f470e7426b4de5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Apr 6 19:21:38 2016 -0700

    quiet warnings, RT#41682

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 651cc95..9174ec3 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -462,7 +462,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
 
     # false laziness w/below
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
 
@@ -522,7 +522,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
     $m->clear_buffer;
     #false laziness w/above
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
 

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

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




More information about the freeside-commits mailing list