merge 0.9.x into 1.0.x

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index a16a02757309f7c73aef92e3df6fd21af30f3e98..3492873c5981574b7d29e71a08641759f901cca6 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -335,7 +335,9 @@ class Action extends HTMLOutputter // lawsuit
                     common_local_url('peopletagautocomplete') . '";');
                 $this->showScriptMessages();
                 // Frame-busting code to avoid clickjacking attacks.
-                $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+                if (common_config('javascript', 'bustframes')) {
+                    $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+                }
                 Event::handle('EndShowStatusNetScripts', array($this));
                 Event::handle('EndShowLaconicaScripts', array($this));
             }