Item12713: fixing html entities

foswiki · Nov 13, 2014 · d427eb0 · d427eb0
1 parent 40a14d4
commit d427eb0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/Foswiki/Plugins/NatSkinPlugin.pm b/lib/Foswiki/Plugins/NatSkinPlugin.pm
@@ -199,13 +199,13 @@ sub endRenderingHandler {
 
   if ($Foswiki::cfg{NatSkin}{FixTypograpghy}) {
     $_[0] =~ s((?<=[^\w\-])\-\-\-(?=[^\w\-\+]))(&#8212;)go;         # emdash
-    $_[0] =~ s/$START``$STOP/&#8220/go;
-    $_[0] =~ s/$START''$STOP/&#8221/go;
-    $_[0] =~ s/$START,,$STOP/&#8222/go;
-    $_[0] =~ s/$START\(c\)$STOP/&#169/go;
-    $_[0] =~ s/$START\(r\)$STOP/&#174/go;
-    $_[0] =~ s/$START\(tm\)$STOP/&#8482/go;
-    $_[0] =~ s/$START\.\.\.$STOP/&#8230/go;
+    $_[0] =~ s/$START``$STOP/&#8220;/go;
+    $_[0] =~ s/$START''$STOP/&#8221;/go;
+    $_[0] =~ s/$START,,$STOP/&#8222;/go;
+    $_[0] =~ s/$START\(c\)$STOP/&#169;/go;
+    $_[0] =~ s/$START\(r\)$STOP/&#174;/go;
+    $_[0] =~ s/$START\(tm\)$STOP/&#8482;/go;
+    $_[0] =~ s/$START\.\.\.$STOP/&#8230;/go;
     $_[0] =~ s/\-&gt;/&#8594;/go;
     $_[0] =~ s/&lt;\-/&#8592;/go;
   }

diff --git a/lib/Foswiki/Plugins/NatSkinPlugin/DEPENDENCIES b/lib/Foswiki/Plugins/NatSkinPlugin/DEPENDENCIES
@@ -1,17 +1,16 @@
 Foswiki::Contrib::CopyContrib,>=2.0,perl,Required.
 Foswiki::Contrib::FamFamFamContrib,>=2075,perl,Required.
-Foswiki::Contrib::NatSkin,>=3.99_004,perl,Required
 Foswiki::Plugins::AutoTemplatePlugin,>=2.01,perl,Required
 Foswiki::Plugins::BreadCrumbsPlugin,>=4318,perl,Required
 Foswiki::Plugins::CaptchaPlugin,>=2.0.0,perl,Optional
 Foswiki::Plugins::DBCachePlugin,>=1,perl,Required
 Foswiki::Plugins::FilterPlugin,>=3491,perl,Required
 Foswiki::Plugins::FlexWebListPlugin,>=3493,perl,Required
 Foswiki::Plugins::ImagePlugin,>=2.40,perl,Required
-Foswiki::Plugins::ImagePlugin,>=6307,perl,Required
 Foswiki::Plugins::JQueryPlugin,>=5.00,perl,Required
 Foswiki::Plugins::MimeIconPlugin,>=1,perl,Required
-Foswiki::Plugins::NatEditPlugin,>=1993,perl,Required
+Foswiki::Plugins::NatEditPlugin,>=8.00,perl,Required
+Foswiki::Contrib::NatSkin,>=3.99_004,perl,Required
 Foswiki::Plugins::PageOptimizerPlugin,>=0.10,perl,Optional
 Foswiki::Plugins::RenderPlugin,>=3644,perl,Required
 Foswiki::Plugins::TopicInteractionPlugin,>=1340,perl,Required