Selaa lähdekoodia

Following up on my long standing threat to remove internal_link hook. Templates make it unnecessary, it is inefficient, and the only plugin using it requires a source patch to the same code anyway.

pdontthink 20 vuotta sitten
vanhempi
commit
341635bc76
3 muutettua tiedostoa jossa 14 lisäystä ja 5 poistoa
  1. 1 0
      ChangeLog
  2. 0 1
      doc/plugin.txt
  3. 13 4
      functions/page_header.php

+ 1 - 0
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
 --------------------

+ 0 - 1
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

+ 13 - 4
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";
 }
 
-?>
+?>