Imported Debian patch 0.2~alpha-1

[roundcube.git] / debian / patches / use_packaged_tinymce.patch

diff --git a/debian/patches/use_packaged_tinymce.patch b/debian/patches/use_packaged_tinymce.patch
index 9732de9e97a34c5eefd7b0d6e3a1d2a9288b831c..72643fc96312250d70bf7f898a76de4646bc093f 100644 (file)
--- a/debian/patches/use_packaged_tinymce.patch
+++ b/debian/patches/use_packaged_tinymce.patch
@@ -1,13 +1,36 @@
 Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc
 ===================================================================
+--- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
++++ a/program/steps/mail/sendmail.inc  2008-06-22 13:51:33.000000000 +0200
+@@ -74,7 +74,7 @@
+   
+   $last_img_pos = 0;
+ 
+-  $searchstr = 'program/js/tiny_mce/plugins/emotions/images/';
++  $searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
+ 
+   // keep track of added images, so they're only added once
+   $included_images = array();
 --- roundcube-0.1~rc2.orig/program/steps/mail/sendmail.inc     2007-11-26 11:42:36.000000000 +0100
 +++ roundcube-0.1~rc2/program/steps/mail/sendmail.inc  2007-11-26 11:44:04.000000000 +0100
 @@ -108,7 +108,7 @@
      if (! in_array($image_name, $included_images))
        {
        // add the image to the MIME message
--      $img_file = $INSTALL_PATH . '/' . $searchstr . $image_name;
-+      $img_file = '/usr/share/tinymce2/www/plugins/emotions/images/' . $image_name;
-       if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
+-      $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
++      $img_file = '/usr/share/tinymce/www/plugins/emotions/img/' . $image_name;
+-      if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
++      if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
          $OUTPUT->show_message("emoticonerror", 'error');
  
+--- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
++++ a/program/steps/mail/sendmail.inc  2008-06-22 14:10:24.000000000 +0200
+@@ -102,7 +102,7 @@
+       array_push($included_images, $image_name);
+       }
+ 
+-    $body = $body_pre . 'cid:_' . $image_name . $body_post;
++    $body = $body_pre . $img_file . $body_post;
+ 
+     $last_img_pos = $pos2;
+     }