From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Nov 2011 22:44:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/pelle/patch/img_size'
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=344a50f5b9594d34eb70bea64c85e46e01765546;hp=937c0742322065452a204069e0ba5abc625ec0c6

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 c8196b412..6e98a2369 100644
--- 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 eb3cc439b..e589b757e 100644
--- 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
index 000000000..5475b67e8
--- /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!