[freeside-commits] branch FREESIDE_4_BRANCH updated. 05290277c18bd1465fd772da9e23e54dab310115

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  05290277c18bd1465fd772da9e23e54dab310115 (commit)
      from  81d75b9e573b0f814ee279b05dadbfb79050626a (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 05290277c18bd1465fd772da9e23e54dab310115
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jul 11 23:39:17 2015 -0700

    include is deprecated, but not ready to enable this warning after all

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index d1535b5..3d577f6 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -508,8 +508,8 @@ if ( -e $addl_handler_use_file ) {
   };
   
   sub include {
-    use vars qw($m @CARP_NOT);
-    warn 'include deprecated; use an HTML::Mason <& &> style include (or $m->scomp) at '. $m->callers(1)->path. "\n";
+    use vars qw($m);
+    #warn 'include deprecated; use an HTML::Mason <& &> style include (or $m->scomp) at '. $m->callers(0)->path. "\n";
     $m->scomp(@_);
   }
 

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

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