diff -cr quicktags/contrib/quicktagsplus/quicktagsplus.info quicktags-new/contrib/quicktagsplus/quicktagsplus.info
*** quicktags/contrib/quicktagsplus/quicktagsplus.info	Tue Feb 12 19:09:19 2008
--- quicktags-new/contrib/quicktagsplus/quicktagsplus.info	Sat Feb 16 13:12:56 2008
***************
*** 1,11 ****
  ; $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"
  package = "Quicktags"
  
  ; Information added by drupal.org packaging script on 2008-02-13
  version = "5.x-3.x-dev"
  project = "quicktags"
  datestamp = "1202861359"
  
--- 1,12 ----
  ; $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
  package = "Quicktags"
  
  ; Information added by drupal.org packaging script on 2008-02-13
  version = "5.x-3.x-dev"
+ core = "6.x"
  project = "quicktags"
  datestamp = "1202861359"
  
diff -cr quicktags/contrib/quicktagsplus/quicktagsplus.module quicktags-new/contrib/quicktagsplus/quicktagsplus.module
*** quicktags/contrib/quicktagsplus/quicktagsplus.module	Tue Feb 12 15:42:42 2008
--- quicktags-new/contrib/quicktagsplus/quicktagsplus.module	Sat Feb 16 13:12:09 2008
***************
*** 12,18 ****
   *using the quicktags_insert hook provided by quicktags
   */    
  function quicktagsplus_quicktags_insert() {
!  $path = base_path() . drupal_get_path('module','quicktagsplus') .'/';
    //we need the path because of the icons.
  /** the first item is the image insert tag.
   * The button was included but unused in the original quicktags
--- 12,18 ----
   *using the quicktags_insert hook provided by quicktags
   */    
  function quicktagsplus_quicktags_insert() {
!  $path = base_path() . drupal_get_path('module', 'quicktagsplus') .'/';
    //we need the path because of the icons.
  /** the first item is the image insert tag.
   * The button was included but unused in the original quicktags
diff -cr quicktags/quicktags.info quicktags-new/quicktags.info
*** quicktags/quicktags.info	Tue Feb 12 19:09:19 2008
--- quicktags-new/quicktags.info	Sat Feb 16 13:02:06 2008
***************
*** 5,10 ****
--- 5,11 ----
  package = "Quicktags"
  ; Information added by drupal.org packaging script on 2008-02-13
  version = "5.x-3.x-dev"
+ core = "6.x"
  project = "quicktags"
  datestamp = "1202861359"
  
diff -cr quicktags/quicktags.module quicktags-new/quicktags.module
*** quicktags/quicktags.module	Tue Feb 12 16:07:20 2008
--- quicktags-new/quicktags.module	Sat Feb 16 13:06:42 2008
***************
*** 4,11 ****
  /**
   * Implementation of hook_help().
   */
! function quicktags_help($section) {
!   switch($section) {
      case 'admin/modules#description':
        return t('Allows Drupal to use quicktags around the textarea for easier user input');
    }
--- 4,11 ----
  /**
   * Implementation of hook_help().
   */
! 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');
    }
***************
*** 117,123 ****
  function theme_quicktags_textfield($element) {
    static $ta_count = 0;
  
!   $path = drupal_get_path('module','quicktags');
  
    //Add the stylesheet
    $stylesheet =  $path .'/quicktags.css';
--- 117,123 ----
  function theme_quicktags_textfield($element) {
    static $ta_count = 0;
  
!   $path = drupal_get_path('module', 'quicktags');
  
    //Add the stylesheet
    $stylesheet =  $path .'/quicktags.css';
***************
*** 146,152 ****
    $html .= '</textarea>';
    $html .= '<script language="JavaScript" type="text/javascript">
      <!--
!       edCanvas[' . $ta_count . '] = document.getElementById(\''.$element['#id'] .'\');
      //-->
    </script>';
    $ta_count++;
--- 146,152 ----
    $html .= '</textarea>';
    $html .= '<script language="JavaScript" type="text/javascript">
      <!--
!       edCanvas['. $ta_count .'] = document.getElementById(\''. $element['#id'] .'\');
      //-->
    </script>';
    $ta_count++;
***************
*** 166,172 ****
   * location;   // optional: onclick action omit the ().
  */
  function quicktags_quicktags_insert() {
!   $path = base_path() . drupal_get_path('module','quicktags') .'/';
  
    $items = array(
      'ed_italic' => array(
--- 166,172 ----
   * location;   // optional: onclick action omit the ().
  */
  function quicktags_quicktags_insert() {
!   $path = base_path() . drupal_get_path('module', 'quicktags') .'/';
  
    $items = array(
      'ed_italic' => array(
***************
*** 195,201 ****
      ),
      'ed_block' => array(
        'name' => 'blockquote',
!       'prefix' =>'<blockquote>',
        'suffix' => '</blockquote>',
        'accesskey' => 'q',
        'weight' => 40,
--- 195,201 ----
      ),
      'ed_block' => array(
        'name' => 'blockquote',
!       'prefix' => '<blockquote>',
        'suffix' => '</blockquote>',
        'accesskey' => 'q',
        'weight' => 40,
***************
*** 203,209 ****
      ),
      'ed_link' => array(
        'name' => 'link',
!       'prefix' =>'<a href="http://">',
        'suffix' => '</a>',
        'accesskey' => 'l',
        'weight' => 50,
--- 203,209 ----
      ),
      'ed_link' => array(
        'name' => 'link',
!       'prefix' => '<a href="http://">',
        'suffix' => '</a>',
        'accesskey' => 'l',
        'weight' => 50,
***************
*** 211,217 ****
      ),
      'ed_break' => array(
        'name' => 'teaser break',
!       'prefix' =>'<!--break-->',
        'accesskey' => 't',
        'weight' => 60,
        'close' => FALSE,
--- 211,217 ----
      ),
      'ed_break' => array(
        'name' => 'teaser break',
!       'prefix' => '<!--break-->',
        'accesskey' => 't',
        'weight' => 60,
        'close' => FALSE,
***************
*** 234,245 ****
    foreach ($items as $id => $item) {
      //build the arglist to pass to JS
      // id, display, tagStart, tagEnd, access, open, location, icon
!     $args = '\''. $id .'\',\''. $item['name'] .'\',\''. $item['prefix'] .'\',\''. $item['suffix'] .'\',\''. $item['accesskey'] .'\',\''. ($item['close'] ? 0 : -1) .'\',\''. $item['location'] .'\',\''.$item['icon'] .'\'';
  
      $output .= "edButtons[edButtons.length] = new edButton(". $args  .");\n" ;
    }
  
!   if($output) {
      drupal_set_header('Content-Type: text/javascript; charset=utf-8');
      print $js ."\n". $output;
    }
--- 234,245 ----
    foreach ($items as $id => $item) {
      //build the arglist to pass to JS
      // id, display, tagStart, tagEnd, access, open, location, icon
!     $args = '\''. $id .'\',\''. $item['name'] .'\',\''. $item['prefix'] .'\',\''. $item['suffix'] .'\',\''. $item['accesskey'] .'\',\''. ($item['close'] ? 0 : -1) .'\',\''. $item['location'] .'\',\''. $item['icon'] .'\'';
  
      $output .= "edButtons[edButtons.length] = new edButton(". $args  .");\n" ;
    }
  
!   if ($output) {
      drupal_set_header('Content-Type: text/javascript; charset=utf-8');
      print $js ."\n". $output;
    }
