]> git.donarmstrong.com Git - roundcube.git/blob - debian/patches/use_packaged_tinymce.patch
Merge commit 'upstream/0.2_stable' into unstable-import
[roundcube.git] / debian / patches / use_packaged_tinymce.patch
1 Use tinymce from tinycme package instead of the shipped one.
2
3 Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc
4 ===================================================================
5 --- a/program/steps/mail/sendmail.inc~  2008-04-30 10:21:42.000000000 +0200
6 +++ a/program/steps/mail/sendmail.inc   2008-06-22 13:51:33.000000000 +0200
7 @@ -74,7 +74,7 @@
8    
9    $last_img_pos = 0;
10  
11 -  $searchstr = 'program/js/tiny_mce/plugins/emotions/images/';
12 +  $searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
13  
14    // keep track of added images, so they're only added once
15    $included_images = array();
16 --- roundcube-0.1~rc2.orig/program/steps/mail/sendmail.inc      2007-11-26 11:42:36.000000000 +0100
17 +++ roundcube-0.1~rc2/program/steps/mail/sendmail.inc   2007-11-26 11:44:04.000000000 +0100
18 @@ -108,7 +108,7 @@
19      if (! in_array($image_name, $included_images))
20        {
21        // add the image to the MIME message
22 -      $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
23 +      $img_file = '/usr/share/tinymce/www/plugins/emotions/img/' . $image_name;
24 -      if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
25 +      if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
26          $OUTPUT->show_message("emoticonerror", 'error');
27  
28 --- a/program/steps/mail/sendmail.inc~  2008-04-30 10:21:42.000000000 +0200
29 +++ a/program/steps/mail/sendmail.inc   2008-06-22 14:10:24.000000000 +0200
30 @@ -102,7 +102,7 @@
31        array_push($included_images, $image_name);
32        }
33  
34 -    $body = $body_pre . 'cid:_' . $image_name . $body_post;
35 +    $body = $body_pre . $img_file . $body_post;
36  
37      $last_img_pos = $pos2;
38      }