From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 9 Oct 2006 02:45:11 +0000 (+0000)
Subject: compose_button_row hook updated to new plugin/templating scheme.  Please learn from... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7ffb780fc4b55993168e83a944203ae08c0cdda3;p=squirrelmail.git

compose_button_row hook updated to new plugin/templating scheme.  Please learn from this and fix plugins instead of reverting other code


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

diff --git a/plugins/squirrelspell/setup.php b/plugins/squirrelspell/setup.php
index e987446a..79189d31 100644
--- a/plugins/squirrelspell/setup.php
+++ b/plugins/squirrelspell/setup.php
@@ -22,7 +22,7 @@
  */
 function squirrelmail_plugin_init_squirrelspell() {
   global $squirrelmail_plugin_hooks;
-  $squirrelmail_plugin_hooks['compose_button_row']['squirrelspell'] =
+  $squirrelmail_plugin_hooks['template_construct_compose_buttons.tpl']['squirrelspell'] = 
       'squirrelspell_setup';
   $squirrelmail_plugin_hooks['optpage_register_block']['squirrelspell'] =
       'squirrelspell_optpage_register_block';
@@ -54,7 +54,7 @@ function squirrelspell_optpage_register_block() {
  */
 function squirrelspell_setup() {
   include_once(SM_PATH . 'plugins/squirrelspell/sqspell_functions.php');
-  squirrelspell_setup_function();
+  return squirrelspell_setup_function();
 }
 
 /**
diff --git a/plugins/squirrelspell/sqspell_functions.php b/plugins/squirrelspell/sqspell_functions.php
index 9653cff0..08e55e8f 100644
--- a/plugins/squirrelspell/sqspell_functions.php
+++ b/plugins/squirrelspell/sqspell_functions.php
@@ -62,7 +62,7 @@ function squirrelspell_setup_function() {
      * use document.write() so the "Check Spelling" button is not
      * displayed if js is off in the browser.
      */
-    echo "<script type=\"text/javascript\">\n".
+    $output = "<script type=\"text/javascript\">\n".
       "<!--\n".
       'document.write("<input type=\"button\" value=\"'.
       _("Check Spelling").
@@ -71,6 +71,7 @@ function squirrelspell_setup_function() {
       'resizable=yes\')\" />");' . "\n".
       "//-->\n".
       "</script>\n";
+    return array('compose_button_row' => $output);
   }
 }