Index: contrib/quicktagsplus/quicktagsplus.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quicktags/contrib/quicktagsplus/quicktagsplus.info,v
retrieving revision 1.1
diff -u -r1.1 quicktagsplus.info
--- contrib/quicktagsplus/quicktagsplus.info	12 Nov 2007 18:19:03 -0000	1.1
+++ contrib/quicktagsplus/quicktagsplus.info	30 Apr 2008 00:54:44 -0000
@@ -1,5 +1,6 @@
 ; $Id: quicktagsplus.info,v 1.1 2007/11/12 18:19:03 tcblack Exp $
 name = "QuicktagsPlus"
 description = "QuicktagsPlus adds buttons to the original quicktags."
-dependencies = "quicktags"
+dependencies[] = "quicktags"
 package = "Quicktags"
+core = 6.x
Index: quicktags.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quicktags/quicktags.info,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 quicktags.info
--- quicktags.info	12 Feb 2008 21:35:06 -0000	1.1.6.1
+++ quicktags.info	30 Apr 2008 00:54:43 -0000
@@ -2,4 +2,5 @@
 
 name = "Quicktags"
 description = "Quicktags adds buttons to your forms, for easy insertation of code (like basic HTML) into a textarea."
-package = "Quicktags"
\ No newline at end of file
+package = "Quicktags"
+core = 6.x
\ No newline at end of file
Index: quicktags.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quicktags/quicktags.module,v
retrieving revision 1.22.2.2
diff -u -r1.22.2.2 quicktags.module
--- quicktags.module	12 Feb 2008 21:07:20 -0000	1.22.2.2
+++ quicktags.module	30 Apr 2008 00:54:44 -0000
@@ -1,11 +1,11 @@
 <?php
-// $Id: quicktags.module,v 1.22.2.2 2008/02/12 21:07:20 tcblack Exp $
+// $Id$
 
 /**
  * Implementation of hook_help().
  */
-function quicktags_help($section) {
-  switch($section) {
+function quicktags_help($path, $arg) {
+  switch($path) {
     case 'admin/modules#description':
       return t('Allows Drupal to use quicktags around the textarea for easier user input');
   }
@@ -41,25 +41,22 @@
 /**
  * Implementation of hook_menu().
  */
-function quicktags_menu($may_cache) {
+function quicktags_menu() {
   $items = array();
 
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'quicktags',
-      'callback' => 'quicktags_javascript',
-      'access' => TRUE,
-      'type' => MENU_CALLBACK
-    );
-    $items[] = array(
-      'path' => 'admin/settings/quicktags',
-      'title' => t('Quicktags'),
-      'description' => t('Configure Quicktags options.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'quicktags_settings',
-      'access' => user_access('administer site configuration'),
-    );
-  }
+  $items['quicktags'] = array(
+    'page callback' => 'quicktags_javascript',
+    'access callback' => TRUE,
+    'type' => MENU_CALLBACK
+  );
+  $items['admin/settings/quicktags'] = array(
+    'title' => 'Quicktags',
+    'description' => t('Configure Quicktags options.'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('quicktags_settings'),
+    'access' => 'user_access',
+    'access arguments' => array('administer site configuration'),
+  );
 
   return $items;
 }
@@ -114,6 +111,14 @@
 /**
  * Attach quicktags to a textarea
  */
+function quicktags_theme() {
+  return array(
+    'quicktags_textfield' => array(
+      'arguments' => array('element'),
+    ),
+  );
+}
+
 function theme_quicktags_textfield($element) {
   static $ta_count = 0;
 
@@ -128,7 +133,7 @@
   drupal_add_js($javascript);
 
   //Add the dynamically generated file
-  drupal_add_js('?q=quicktags');
+  drupal_add_js('quicktags', 'module', 'header', FALSE, TRUE, FALSE);
   //using cache = FALSE might seem a good option, but this breaks on the menu.
 
   $cols = ($element['#cols'] ? ' cols="'. $element['#cols'] .'"' : '');