From 54632f79653879050fba05341ece531ab2448264 Mon Sep 17 00:00:00 2001
From: mrpete <mrpete@e107.org>
Date: Sat, 20 Jan 2007 16:25:55 +0000
Subject: [PATCH] remove incompatible hook= code; replace w/ new support for
 "SuperModifiers" as designed  by team

---
 e107_plugins/forum/forum_shortcodes.php     |  2 +-
 e107_plugins/links_page/link_shortcodes.php |  4 ++--
 e107_plugins/linkwords/linkwords.php        | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/e107_plugins/forum/forum_shortcodes.php b/e107_plugins/forum/forum_shortcodes.php
index e64c91271..99214813b 100644
--- a/e107_plugins/forum/forum_shortcodes.php
+++ b/e107_plugins/forum/forum_shortcodes.php
@@ -22,7 +22,7 @@ SC_END
 SC_BEGIN POST
 global $post_info, $tp, $iphost;
 $ret = "";
-$ret = $tp->toHTML($post_info["thread_thread"], TRUE, "hook=content", 'class:'.$post_info["user_class"]);
+$ret = $tp->toHTML($post_info["thread_thread"], TRUE, "BODY", 'class:'.$post_info["user_class"]);
 if (ADMIN && $iphost) {
 $ret .= "<br />".$iphost;
 }
diff --git a/e107_plugins/links_page/link_shortcodes.php b/e107_plugins/links_page/link_shortcodes.php
index bb331dc19..7bf848f27 100644
--- a/e107_plugins/links_page/link_shortcodes.php
+++ b/e107_plugins/links_page/link_shortcodes.php
@@ -163,7 +163,7 @@ SC_END
 
 SC_BEGIN LINK_MAIN_DESC
 global $LINK_MAIN_DESC, $rowl, $linkspage_pref, $tp;
-return (isset($linkspage_pref['link_cat_desc']) && $linkspage_pref['link_cat_desc'] ? $tp->toHTML($rowl['link_category_description'], TRUE,'hook=description') : "");
+return (isset($linkspage_pref['link_cat_desc']) && $linkspage_pref['link_cat_desc'] ? $tp->toHTML($rowl['link_category_description'], TRUE,'description') : "");
 SC_END
 
 SC_BEGIN LINK_MAIN_NUMBER
@@ -308,7 +308,7 @@ SC_END
 
 SC_BEGIN LINK_DESC
 global $LINK_DESC, $linkspage_pref, $tp, $rowl;
-return (isset($linkspage_pref['link_desc']) && $linkspage_pref['link_desc'] ? $tp->toHTML($rowl['link_description'], TRUE,'hook=content') : "");
+return (isset($linkspage_pref['link_desc']) && $linkspage_pref['link_desc'] ? $tp->toHTML($rowl['link_description'], TRUE,'BODY') : "");
 SC_END
 
 SC_BEGIN LINK_RATING
diff --git a/e107_plugins/linkwords/linkwords.php b/e107_plugins/linkwords/linkwords.php
index 7ac9d3bd0..1e6730cdb 100644
--- a/e107_plugins/linkwords/linkwords.php
+++ b/e107_plugins/linkwords/linkwords.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/linkwords/linkwords.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2007-01-17 21:29:28 $
-|     $Author: e107steved $
+|     $Revision: 1.4 $
+|     $Date: 2007-01-20 16:25:55 $
+|     $Author: mrpete $
 |
 +----------------------------------------------------------------------------+
 */
@@ -27,10 +27,13 @@ class e_linkwords
 	var $link_list = array();		// Corresponding list of links to apply
 	var $tip_list  = array();
 	var $area_opts = array(
+			'olddefault' => TRUE,
 			'title' => FALSE,
 			'summary' => FALSE,
-			'content' => TRUE,
-			'description' => TRUE
+			'body' => TRUE,
+			'description' => TRUE,
+			'linktext' => FALSE,
+			'rawtext' => FALSE
 			);						// We can set this from prefs later
 	var $block_list = array(
 //			'page.php?3',