Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / bugs / img_plugin_should_pass_through_class_attribute.mdwn

diff --git a/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn b/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
index c66055dd0ad2730233caf8e54d36676ef409c509..f72ecade2b41cfebfb6fa1f52af3552f4dca59d8 100644 (file)
--- a/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
+++ b/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
@@ -6,6 +6,8 @@ An example of the feature in use can be seen here (notice class="floatleft" and
 
 And here's a patch to implement it. Will this survive markdown munging? It seems quite unlikely... How does one protect a block like this? Oh well, we'll see what happens.
 
 
 And here's a patch to implement it. Will this survive markdown munging? It seems quite unlikely... How does one protect a block like this? Oh well, we'll see what happens.
 

+> thanks, [[done]] --[[Joey]]
+

 -Carl
 
     From 405c29ba2ef97a514bade33ef826e71fe825962b Mon Sep 17 00:00:00 2001
 -Carl
 
     From 405c29ba2ef97a514bade33ef826e71fe825962b Mon Sep 17 00:00:00 2001


@@ -24,7 +26,7 @@ And here's a patch to implement it. Will this survive markdown munging? It seems
     index 7226231..3eb1ae7 100644
     --- a/Plugin/img.pm
     +++ b/Plugin/img.pm
     index 7226231..3eb1ae7 100644
     --- a/Plugin/img.pm
     +++ b/Plugin/img.pm

-    @@ -93,9 +93,15 @@ sub preprocess (@) { #{{{
+    @@ -93,9 +93,15 @@ sub preprocess (@) {

                     $imgurl="$config{url}/$imglink";
             }
      
                     $imgurl="$config{url}/$imglink";
             }
      


@@ -40,7 +42,7 @@ And here's a patch to implement it. Will this survive markdown munging? It seems
     +        $result .= '/></a>';
     +
     +        return $result;
     +        $result .= '/></a>';
     +
     +        return $result;

-     } #}}}
+     }

      
      1
     -- 
      
      1
     --