Merge remote-tracking branch 'remotes/pelle/patch/img_size'

diff --git a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn
index c8196b412057dbf2dc17f3466453247eecd8c1bd..6e98a2369c1c807c877a3c18eab630b2b210c0fa 100644 (file)
--- a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn
+++ b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn
@@ -4,22 +4,4 @@ In those cases img plugin do generate HTML with the missing attribute as "empty"
 
 If we instead always get the resulting the width and height from the resized image, and uses those values in the img attrs, we make IE happy (and all other renders as well).
 
-Inline patch:
-
-diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
-index b98e843..398e9bc 100644
---- a/IkiWiki/Plugin/img.pm
-+++ b/IkiWiki/Plugin/img.pm
-@@ -132,9 +132,9 @@ sub preprocess (@) {
-                                        $imglink = $file;
-                                }
-                        }
--
--                       $dwidth = $im->Get("width") unless defined $dwidth;
--                       $dheight = $im->Get("height") unless defined $dheight;
-+                       # get true image width and height from resized image attributes
-+                       $dwidth  = $im->Get("width");
-+                       $dheight = $im->Get("height");
-                }
-        }
-        else {
+A patch (tested and deployed) is sitting waiting in my git repository.

diff --git a/doc/git.mdwn b/doc/git.mdwn
index eb3cc439b0dd803e29e852e111e042c27babe69d..e589b757e8bdcd33d04e80fa85f60edf53bdd7ed 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -73,6 +73,7 @@ think about merging them. This is recommended. :-)
 * [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/`
 * nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git`
 * [[yds]] `git://github.com/yds/ikiwiki.git`
+* [[pelle]] `git://gitorious.org/pelle-ikiwiki/patches.git`
 
 ## branches
 

diff --git a/doc/users/pelle.mdwn b/doc/users/pelle.mdwn
new file mode 100644 (file)
index 0000000..5475b67
--- /dev/null
+++ b/doc/users/pelle.mdwn
@@ -0,0 +1 @@
+Have migrated some company internal wiki's from MediaWiki to IkiWiki. Going from mysql+php to git+perl is a blessing, never going to look back!