From 25e61916f9d904ce8c93fb99fa20ada78eae4e13 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 2 Nov 2013 00:35:59 +0100 Subject: [PATCH] There are no LaconicaScripts left --- EVENTS.txt | 6 ------ lib/action.php | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index 82085ec9de..95763bb56e 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -51,12 +51,6 @@ StartShowStatusNetScripts: Showing StatusNet script links (use this to link to a EndShowStatusNetScripts: End showing StatusNet script links - $action: the current action -StartShowLaconicaScripts: backwards compatibility; deprecated -- $action: the current action - -EndShowLaconicaScripts: backwards compatibility; deprecated -- $action: the current action - StartShowSections: Start the list of sections in the sidebar - $action: the current action diff --git a/lib/action.php b/lib/action.php index 8cff342229..ddfc5a505a 100644 --- a/lib/action.php +++ b/lib/action.php @@ -381,8 +381,7 @@ class Action extends HTMLOutputter // lawsuit Event::handle('EndShowJQueryScripts', array($this)); } - if (Event::handle('StartShowStatusNetScripts', array($this)) && - Event::handle('StartShowLaconicaScripts', array($this))) { + if (Event::handle('StartShowStatusNetScripts', array($this))) { if (common_config('site', 'minify')) { $this->script('util.min.js'); } else { @@ -403,7 +402,6 @@ class Action extends HTMLOutputter // lawsuit $this->inlineScript('if (window.top !== window.self) { document.write = ""; window.top.location = window.self.location; setTimeout(function () { document.body.innerHTML = ""; }, 1); window.self.onload = function () { document.body.innerHTML = ""; }; }'); } Event::handle('EndShowStatusNetScripts', array($this)); - Event::handle('EndShowLaconicaScripts', array($this)); } Event::handle('EndShowScripts', array($this)); }