projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1043c75)
Following up on my long standing threat to remove internal_link hook. Templates...
authorpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Wed, 24 Nov 2004 22:33:11 +0000 (22:33 +0000)
committerpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Wed, 24 Nov 2004 22:33:11 +0000 (22:33 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8397 7612ce4b-ef26-0410-bec9-ea0150e637f0

ChangeLog patch | blob | blame | history
doc/plugin.txt patch | blob | blame | history
functions/page_header.php patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index c5c499779e5110ba378e10796084305817b6e2d1..66bbc3b77f38f8ced8ae46fdb574346110a0a790 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -161,6 +161,7 @@ Version 1.5.1 -- CVS
   - Handle a reload of the signout page gracefully: do not present an error
     about having to be logged in to be able to sign out. Fixes #1070069.
   - Prevent & being eaten in set_url_var, thanks Marcin Orlowski. Fixes #1053725.
+  - Removed internal_link hook
 
 Version 1.5.0
 --------------------
diff --git a/doc/plugin.txt b/doc/plugin.txt
index 5aa907a8c074a0fbb3659a9730cef999e5a4a35c..bb1438182bd43afd10947f3fa06b9fe4fb723b43 100644 (file)
--- a/doc/plugin.txt
+++ b/doc/plugin.txt
@@ -294,7 +294,6 @@ but may be out of date soon thereafter.  You never know.  ;-)
   decode_body                    functions/mime.php              hook_func
   generic_header                 functions/page_header.php       do_hook
   menuline                       functions/page_header.php       do_hook
-  internal_link                  functions/page_header.php       hook_func
   loading_prefs                  include/load_prefs.php          do_hook
   addrbook_html_search_below     src/addrbook_search_html.php    do_hook
   addressbook_bottom             src/addressbook.php             do_hook
diff --git a/functions/page_header.php b/functions/page_header.php
index 9561f0f4a1e3603179126b85b4a318b316873ba2..8fed43b9dc722fa41f3c0c8e4aaaf8eb8c7a4bb1 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -96,9 +96,18 @@ function makeInternalLink($path, $text, $target='') {
     if ($target != '') {
         $target = " target=\"$target\"";
     }
-    $hooktext = do_hook_function('internal_link',$text);
-    if ($hooktext != '')
-        $text = $hooktext;
+
+    // This is an inefficient hook and is only used by 
+    // one plugin that still needs to patch this code,
+    // plus if we are templat-izing SM, visual hooks 
+    // are not needed.  However, I am leaving the code 
+    // here just in case we find a good (non-visual?) 
+    // use for the internal_link hook.
+    //
+    //$hooktext = do_hook_function('internal_link',$text);
+    //if ($hooktext != '')
+    //    $text = $hooktext;
+
     return '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
 }
 
@@ -431,4 +440,4 @@ function compose_Header($color, $mailbox) {
     echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" $onload>\n\n";
 }
 
-?>
\ No newline at end of file
+?>
Unnamed repository; edit this file 'description' to name the repository.