Handle incorrect upgrade from 0.3.1-6 when "changed" column already

[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 db835faf863d4eac5878bf24fa1a402ba2a5901a..438267306797d0fd724beb73bdc5c0559634377c 100644 (file)
--- a/debian/patches/use_packaged_tinymce.patch
+++ b/debian/patches/use_packaged_tinymce.patch
@@ -1,37 +1,15 @@
---- roundcube_0.1-rc2/program/js/editor.js     2007-06-09 01:47:57.000000000 +0200
-+++ roundcube_0.1-rc2/program/js/editor.js     2007-10-29 21:47:07.000000000 +0100
-@@ -27,10 +27,7 @@
-                  theme_advanced_buttons3 : '',
-                  theme_advanced_toolbar_location : 'top',
-                  theme_advanced_toolbar_align : 'left',
--                 extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]',
--                 content_css : skin_path + '/editor_content.css',
--                 popups_css : skin_path + '/editor_popup.css',
--                 editor_css : skin_path + '/editor_ui.css'
-+                 extended_valid_elements : 'font[face|size|color|style],span[id|class|align|style]'
-                });
-   }
+Use tinymce from tinycme package instead of the shipped one.
+
+Index: b/program/steps/mail/sendmail.inc
+===================================================================
+--- a/program/steps/mail/sendmail.inc  2009-10-14 12:52:27.000000000 +0200
++++ b/program/steps/mail/sendmail.inc  2010-07-17 17:33:23.000000000 +0200
+@@ -115,7 +115,7 @@
  
---- roundcube_0.1-rc2/program/steps/settings/edit_identity.inc 2007-04-28 20:07:12.000000000 +0200
-+++ roundcube_0.1-rc2/program/steps/settings/edit_identity.inc 2007-10-29 21:46:33.000000000 +0100
-@@ -49,9 +49,6 @@
-   $OUTPUT->include_script('tiny_mce/tiny_mce_src.js');
-   $OUTPUT->add_script("tinyMCE.init({ mode : 'specific_textareas'," .
-                                     "apply_source_formatting : true," .
--                                    "content_css : '\$__skin_path' + '/editor_content.css'," .
--                                    "popups_css : '\$__skin_path' + '/editor_popups.css'," .
--                                    "editor_css : '\$__skin_path' + '/editor_ui.css'," .
-                                     "theme : 'advanced'," .
-                                     "theme_advanced_toolbar_location : 'top'," .
-                                     "theme_advanced_toolbar_align : 'left'," .
---- roundcube_0.1-rc2/program/steps/mail/sendmail.inc  2007-09-26 10:13:21.000000000 +0200
-+++ roundcube_0.1-rc2/program/steps/mail/sendmail.inc  2007-10-29 22:04:20.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/tinymce/www/plugins/emotions/images/' . $image_name;
-       if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
-         $OUTPUT->show_message("emoticonerror", 'error');
+         // sanitize image name so resulting attachment doesn't leave images dir
+         $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name);
+-        $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
++        $img_file = '/usr/share/tinymce/www/plugins/emotions/img/' . $image_name;
  
+         if (! in_array($image_name, $included_images)) {
+           // add the image to the MIME message