Merge branch 'dev-0.7.x' into framebusting

Conflicts:
	lib/action.php

diff --cc lib/action.php
index 48d5821a17324ea6573429f6b42a02b8ba847f68,8ff9e646b8cb769e3c60bc4bdde2e99af07c9daa..e2d09ace2bc8d52822a07cfceff70dac1a1de3f7
--- 1/lib/action.php
--- 2/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));