diff -u -r drupal_orig/modules/bbcode/bbcode-filter.inc drupal/modules/bbcode/bbcode-filter.inc
--- drupal_orig/modules/bbcode/bbcode-filter.inc	2004-08-16 21:26:37.000000000 +0200
+++ drupal/modules/bbcode/bbcode-filter.inc	2004-08-27 11:51:07.000000000 +0200
@@ -1,19 +1,6 @@
 <?php
 // $Id: bbcode-filter.inc,v 1.2 2004/08/16 19:26:37 goba Exp $
 
-function _bbcode_filter($op, &$text) {
-  switch ($op) {
-    case "name":
-      return t("BBCode filter");
-    case "process":
-      return _bbcode_filter_process($text);
-    case "settings":
-      return _bbcode_filter_settings($text);
-    default:
-      return $text;
-  }
-}
-
 function _bbcode_filter_process(&$body) {
   
   $quote_text = t('Quote');
@@ -27,9 +14,9 @@
     '#\[font=(.*?)(?::\w+)?\](.*?)\[/font(?::\w+)?\]#si'     => '<span style="font-family:\\1">\\2</span>',
     '#\[align=(.*?)(?::\w+)?\](.*?)\[/align(?::\w+)?\]#si'   => '<div style="text-align:\\1">\\2</div>',
     '#\[float=(.*?)(?::\w+)?\](.*?)\[/float(?::\w+)?\]#si'   => '<div style="float:\\1">\\2</div>',
-    '#\[b(?::\w+)?\](.*?)\[/b(?::\w+)?\]#si'                 => '<b>\\1</b>',
-    '#\[i(?::\w+)?\](.*?)\[/i(?::\w+)?\]#si'                 => '<i>\\1</i>',
-    '#\[u(?::\w+)?\](.*?)\[/u(?::\w+)?\]#si'                 => '<u>\\1</u>',
+    '#\[b(?::\w+)?\](.*?)\[/b(?::\w+)?\]#si'                 => '<span style="font-weigth:bold">\\1</span>',
+    '#\[i(?::\w+)?\](.*?)\[/i(?::\w+)?\]#si'                 => '<span style="font-style:italic">\\1</span>',
+    '#\[u(?::\w+)?\](.*?)\[/u(?::\w+)?\]#si'                 => '<span style="text-decoration:underline">\\1</span>',
     '#\[center(?::\w+)?\](.*?)\[/center(?::\w+)?\]#si'       => '<div style="text-align:center">\\1</div>',
     '#\[left(?::\w+)?\](.*?)\[/left(?::\w+)?\]#si'           => '<div style="text-align:left">\\1</div>',
     '#\[right(?::\w+)?\](.*?)\[/right(?::\w+)?\]#si'         => '<div style="text-align:right">\\1</div>',
@@ -130,7 +117,3 @@
     return '<ul class="bb-list">\\1</ul>';
   }
 }
-
-function _bbcode_filter_settings() {
-  return form_group(t("BBCode filter"), t("The bbcode filter is enabled. You can get more information about the possible formatting rules on the <a href=\"%filter_tips\">Compose Tips</a> page.", array("%filter_tips" => url("filter/tips", NULL, 'filter-bbcode'))));
-}
diff -u -r drupal_orig/modules/bbcode/bbcode.module drupal/modules/bbcode/bbcode.module
--- drupal_orig/modules/bbcode/bbcode.module	2004-08-16 21:26:37.000000000 +0200
+++ drupal/modules/bbcode/bbcode.module	2004-08-27 10:57:27.000000000 +0200
@@ -2,21 +2,38 @@
 // $Id: bbcode.module,v 1.28 2004/08/16 19:26:37 goba Exp $
 
 function bbcode_help($section) {
-  if ($section == "admin/system/modules#description") {
-    return t("Use bbcode in your posts.");
+  if ($section == "admin/modules#description") {
+    return t("Allow the use of bbcode in your posts.");
   }
-   
-  elseif ($section == 'filter#short-tip') {
-    return t("You can use <a href=\"%bbcode_help\">BBCode tags</a> in the text, URLs will be automatically converted to links", array("%bbcode_help" => url('filter/tips', NULL, 'filter-bbcode')));
-  }
-  
-  elseif ($section == "filter#long-tip") {
+}
+
+function bbcode_filter_tips($delta, $format, $long = false) {
+  if ($long) {
     include_once 'bbcode-help.inc';
     return _bbcode_filter_tip();
   }
+  else {
+    return t("You can use <a href=\"%bbcode_help\">BBCode tags</a> in the text, URLs will be automatically converted to links", array("%bbcode_help" => url('filter/tips', NULL, 'filter-bbcode')));
+  }
 }
 
-function bbcode_filter($op, $text = "") {
-  include_once 'bbcode-filter.inc';
-  return _bbcode_filter($op, $text);
+function bbcode_filter($op, $delta = 0, $format =  -1, $text = '') {
+  switch ($op) {
+    case 'list':
+      return array(0 => t('BBCode'));
+    
+    case 'description':
+      return t('Converts BBCode to html.');
+      
+    case 'process':
+      include_once 'bbcode-filter.inc';
+      return _bbcode_filter_process($text);
+      
+    case 'settings':
+      return;
+      
+    default:
+      return $text;
+  }
 }
+?>