[freeside-commits] branch FREESIDE_4_BRANCH updated. 51832db3ca7575ef21685ccc4f15c9d8af52756c

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  51832db3ca7575ef21685ccc4f15c9d8af52756c (commit)
      from  334eb034f27b147e998cb6b481265091d817ea0e (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 51832db3ca7575ef21685ccc4f15c9d8af52756c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jan 15 15:46:33 2016 -0800

    fix self-service fallout from clickjacking fix, RT#39881

diff --git a/FS/FS/Mason/Request.pm b/FS/FS/Mason/Request.pm
index b33efcc..0d9c6d4 100644
--- a/FS/FS/Mason/Request.pm
+++ b/FS/FS/Mason/Request.pm
@@ -65,9 +65,11 @@ sub freeside_setup {
             if fileno(STDOUT) != 1;
     }
 
-    FS::Trace->log('    adding headers');
-    #frame-ancestors not supported by all the major browsers yet
-    $HTML::Mason::Commands::r->header_out( 'X-Frame-Options', 'SAMEORIGIN' );
+    if ( $HTML::Mason::Commands::r ) {
+      FS::Trace->log('    adding headers');
+      #frame-ancestors not supported by all the major browsers yet
+      $HTML::Mason::Commands::r->header_out( 'X-Frame-Options', 'SAMEORIGIN' );
+    }
 
     if ( $filename =~ qr(/REST/\d+\.\d+/NoAuth/) ) {
 

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

Summary of changes:
 FS/FS/Mason/Request.pm |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)