summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-19 16:55:24 -0500
committerEvan Prodromou <evan@status.net>2010-02-19 16:55:24 -0500
commitd69f6dff6a0b62ddab929f6ba0801533a9031162 (patch)
tree2b49953ca2b5306a512f90e5d780cbe07d225b3c /lib
parentb0327506a491f029b239ae703e1acb1d42ae299c (diff)
parenta1a3ab1c58cf8636c4e9ac6b9d44bdc18946a547 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts: plugins/OStatus/actions/salmon.php
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/action.php b/lib/action.php
index b85f353a3..fa9ddb911 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -249,7 +249,7 @@ class Action extends HTMLOutputter // lawsuit
$this->script('jquery.min.js');
$this->script('jquery.form.js');
$this->script('jquery.cookie.js');
- $this->script('json2.js');
+ $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
$this->script('jquery.joverlay.min.js');
Event::handle('EndShowJQueryScripts', array($this));
}
@@ -259,8 +259,7 @@ class Action extends HTMLOutputter // lawsuit
$this->script('util.js');
$this->script('geometa.js');
// 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->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
Event::handle('EndShowStatusNetScripts', array($this));
Event::handle('EndShowLaconicaScripts', array($this));
}