diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-21 11:12:56 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-21 11:12:56 -0800 |
| commit | 85528ccb1f5840a8c73f6c939f12d98bb3680cde (patch) | |
| tree | be0f09c02a2bf003c23d6be98919783347b9786d /lib/action.php | |
| parent | 86f2f530ef60fdb601720885d493cf5b2a446e6b (diff) | |
| parent | 3e7a2a4014dd93637f5a666e238dde13e397523c (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 5 |
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)); } |