inline: Ignore parent dirs when sorting pages by title.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 9c336e7d7cb57c3ce98a8d9786e1b2fb96a0d71e..1a6c7cfcd580ac35b755a8a3a446c77521aad0e1 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -186,7 +186,7 @@ sub preprocess_inline (@) { #{{{
        }
 
        if (exists $params{sort} && $params{sort} eq 'title') {
        }
 
        if (exists $params{sort} && $params{sort} eq 'title') {

-               @list=sort @list;
+               @list=sort { pagetitle(basename($a)) cmp pagetitle(basename($b)) } @list;

        }
        elsif (exists $params{sort} && $params{sort} eq 'mtime') {
                @list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;
        }
        elsif (exists $params{sort} && $params{sort} eq 'mtime') {
                @list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list;

diff --git a/debian/changelog b/debian/changelog
index a7d27fd84fcc2432aca1da7961348945b0d590b8..b98b57491b70bb379ec9f42156ea915af1c2c503 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ ikiwiki (2.60) UNRELEASED; urgency=low
   [ Josh Triplett ]
   * Add Suggests on texlive and texlive-science for the teximg plugin
 
   [ Josh Triplett ]
   * Add Suggests on texlive and texlive-science for the teximg plugin
 

+  [ Joey Hess ]
+  * inline: Ignore parent dirs when sorting pages by title.
+

  -- Josh Triplett <josh@freedesktop.org>  Wed, 06 Aug 2008 20:56:06 -0700
 
 ikiwiki (2.56) unstable; urgency=low
  -- Josh Triplett <josh@freedesktop.org>  Wed, 06 Aug 2008 20:56:06 -0700
 
 ikiwiki (2.56) unstable; urgency=low

diff --git a/doc/bugs/inline_sort-by-title_issues.mdwn b/doc/bugs/inline_sort-by-title_issues.mdwn
index bbb079f897cbebb976f29532f10c4b2042be5b25..884846b32709680a6048ffaecfda49a1c5680392 100644 (file)
--- a/doc/bugs/inline_sort-by-title_issues.mdwn
+++ b/doc/bugs/inline_sort-by-title_issues.mdwn
@@ -51,3 +51,7 @@ And here is a [[patch]] for this.  It makes `sort=title` actually sort on the ti
      * `reverse` - If set to "yes", causes the sort order to be reversed.
      * `feedshow` - Specify the maximum number of matching pages to include in
        the rss/atom feeds. The default is the same as the `show` value above.
      * `reverse` - If set to "yes", causes the sort order to be reversed.
      * `feedshow` - Specify the maximum number of matching pages to include in
        the rss/atom feeds. The default is the same as the `show` value above.

+
+> Thanks for the patch. [[done]], but I left off the sort=path. Also left
+> off the lc (if you ask your locale to sort case-sensatively, it should, I
+> think). --[[Joey]]