From: Meitar Moscovitz <meitarm@gmail.com>
Date: Wed, 18 Feb 2009 02:01:52 +0000 (+1100)
Subject: Merge branch 'dev-0.7.x' into framebusting
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cca1d777485d9b5f41bbc65ad10b002702f0aae4;p=quix0rs-gnu-social.git

Merge branch 'dev-0.7.x' into framebusting

Conflicts:
	lib/action.php
---

cca1d777485d9b5f41bbc65ad10b002702f0aae4
diff --cc lib/action.php
index 48d5821a17,8ff9e646b8..e2d09ace2b
--- a/lib/action.php
+++ b/lib/action.php
@@@ -205,9 -224,18 +224,17 @@@ class Action extends HTMLOutputter // l
                  $this->element('script', array('type' => 'text/javascript',
                                                 'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
                                 ' ');
 -
 +                // Frame-busting code to avoid clickjacking attacks.
 +                $this->element('script', array('type' => 'text/javascript'),
 +                               'if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+ 
+                 $this->element('script', array('type' => 'text/javascript',
+                                                'src' => common_path('js/flowplayer-3.0.5.min.js')),
+                                ' ');
+ 
+                 $this->element('script', array('type' => 'text/javascript',
+                                                'src' => common_path('js/video.js')),
+                                ' ');
 -
 -
 -
                  Event::handle('EndShowLaconicaScripts', array($this));
              }
              Event::handle('EndShowScripts', array($this));