removed unused and unneeded hooks

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7770 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 91fcc1b373213ee7fa69f85c4f9e821f31e5096a..27de142967070c9c7479ab7e7e2627c29aeae85a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ Version 1.5.1 -- CVS
   - Prefs caching didn't work properly with register_globals off (#995102).
   - Security: fix SQL injection vulnerability in addressbook
     (CVE ID: CAN-2004-0521).
+  - Removed html_top and html_bottom hooks.  No longer used/needed.
 
 Version 1.5.0
 --------------------

diff --git a/doc/plugin.txt b/doc/plugin.txt
index 6116ae6e510904980fdc2b9b7003f69acf6d718e..404506a00496b48f9992a783d3f30e6a82fbaf10 100644 (file)
--- a/doc/plugin.txt
+++ b/doc/plugin.txt
@@ -308,10 +308,8 @@ but may be out of date soon thereafter.  You never know.  ;-)
   read_body_menu_top             src/read_body.php               hook_func
   read_body_menu_bottom          src/read_body.php               do_hook
   read_body_header_right         src/read_body.php               do_hook
-  html_top                       src/read_body.php               do_hook
   read_body_top                  src/read_body.php               do_hook
   read_body_bottom               src/read_body.php               do_hook
-  html_bottom                    src/read_body.php               do_hook
   login_before                   src/redirect.php                do_hook
   login_verified                 src/redirect.php                do_hook
   generic_header                 src/right_main.php              do_hook

diff --git a/src/read_body.php b/src/read_body.php
index 069d3a7bfb7eb947542967f8d74fa23c84e8935a..eb8c9ad362ea72b99685868c08bd059751157e89 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -841,7 +841,6 @@ if (isset($passed_ent_id) && $passed_ent_id) {
 }
 $header = $message->header;
 
-do_hook('html_top');
 
 /****************************************/
 /* Block for handling incoming url vars */
@@ -949,7 +948,6 @@ if (($attachment_common_show_images) &&
 formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE);
 
 do_hook('read_body_bottom');
-do_hook('html_bottom');
 sqimap_logout($imapConnection);
 /* sessions are written at the end of the script. it's better to register
    them at the end so we avoid double session_register calls */