changeset 296:cd6645e6841f

bug fix escape " by "
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Sun, 05 Oct 2008 12:40:18 +0200
parents b106dd7b0336
children 161a2574cf69
files data/plugin/action/arnica_slides.py data/plugin/parser/text_x_arnica.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/action/arnica_slides.py	Sun Oct 05 12:03:18 2008 +0200
+++ b/data/plugin/action/arnica_slides.py	Sun Oct 05 12:40:18 2008 +0200
@@ -269,7 +269,7 @@
         "server": request.getQualifiedURL(),
         "link_url": link_to_image,
         "alt_text": wikiutil.escape(alias[idx].replace('<<BR>>',' '), quote=1),
-        "this_alias_text": wikiutil.renderText(request, WikiParser, alias[idx].replace('<<BR>>',' ')),
+        "this_alias_text": wikiutil.renderText(request, WikiParser, alias[idx].replace('<<BR>>',' ').replace('&quot;', '"')),
         "this_exif_date_text": wikiutil.escape(exif_date[idx], quote=1),
         "this_image": image_url,
         "pagename": pagename,
--- a/data/plugin/parser/text_x_arnica.py	Sun Oct 05 12:03:18 2008 +0200
+++ b/data/plugin/parser/text_x_arnica.py	Sun Oct 05 12:40:18 2008 +0200
@@ -169,7 +169,7 @@
         "url": Page(self.request, self.pagename).url(self.request),
         "pagename": self.pagename,
         "htdocs": self.request.cfg.url_prefix_static,
-        "description": packLine([self.arnica_image[image][3]] + [self.arnica_image[img][2] for img in selected_images]),
+        "description": packLine([(self.arnica_image[image][3]).replace('"', '&quot;')] + [(self.arnica_image[img][3]).replace('"', '&quot;') for img in selected_images]),
         "exif_date": packLine([self.arnica_image[image][2]] + [self.arnica_image[img][2] for img in selected_images]),
         "target": self.arnica_image[image][0],
         "original_images": packLine([image] + selected_images),
@@ -244,7 +244,7 @@
         "title": title,
         "url": Page(self.request, self.pagename).url(self.request),
         "pagename": self.pagename,
-        "description": packLine([self.arnica_image[image][3]] + [self.arnica_image[img][3] for img in selected_images]),
+        "description": packLine([(self.arnica_image[image][3]).replace('"','&quot;')] + [(self.arnica_image[img][3]).replace('"','&quot;') for img in selected_images]),
         "exif_date": packLine([self.arnica_image[image][2]] + [self.arnica_image[img][2] for img in selected_images]),
         "target": self.arnica_image[image][0],
         "original_images": packLine([image] + selected_images),