There are no LaconicaScripts left

diff --git a/EVENTS.txt b/EVENTS.txt
index 82085ec9deb34e51ed8ae8aad108673750b2bba8..95763bb56eca4951e0f427c9b612b2d333ab3ce0 100644 (file)
--- 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 8cff342229bde48cd1516d20a4c7c797a1abea7f..ddfc5a505af844891a162fd25f972f498b1562e7 100644 (file)
--- 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));
         }