[TWiki-Dev] [SVN] r8967 - twiki/branches/TWikiRelease04x00/lib/TWiki

[<Cra...@nt...>]

Author: CrawfordCurrie
Date: 2006-02-27 09:41:51 -0800 (Mon, 27 Feb 2006)
New Revision: 8967

Modified:
   twiki/branches/TWikiRelease04x00/lib/TWiki/Attach.pm
Log:
Item1743: merged fix from DEVELOP

Modified: twiki/branches/TWikiRelease04x00/lib/TWiki/Attach.pm
===================================================================
--- twiki/branches/TWikiRelease04x00/lib/TWiki/Attach.pm	2006-02-27 17:07:27 UTC (rev 8966)
+++ twiki/branches/TWikiRelease04x00/lib/TWiki/Attach.pm	2006-02-27 17:41:51 UTC (rev 8967)
@@ -78,7 +78,7 @@
 
     my $showAll = $attrs->{all};
     my $showAttr = $showAll ? 'h' : '';
-	my $a = ( $showAttr ) ? ':A' : '';
+	my $A = ( $showAttr ) ? ':A' : '';
     my $title = $attrs->{title} || '';
 
 	my @attachments = $meta->find( 'FILEATTACHMENT' );
@@ -88,8 +88,8 @@
     $templates->readTemplate('attachtables');
 
 	my $rows = '';
-    my $row = $templates->expandTemplate('ATTACH:files:row'.$a);
-    foreach my $attachment ( @attachments ) {
+    my $row = $templates->expandTemplate('ATTACH:files:row'.$A);
+    foreach my $attachment ( sort { $a->{date} <=> $b->{date} } @attachments ) {
         my $attrAttr = $attachment->{attr};
 
         if( ! $attrAttr || ( $showAttr && $attrAttr =~ /^[$showAttr]*$/ )) {
@@ -100,8 +100,8 @@
     my $text = '';
 
     if( $showAll || $rows ne '' ) {
-        my $header = $templates->expandTemplate('ATTACH:files:header'.$a);
-        my $footer = $templates->expandTemplate('ATTACH:files:footer'.$a);
+        my $header = $templates->expandTemplate('ATTACH:files:header'.$A);
+        my $footer = $templates->expandTemplate('ATTACH:files:footer'.$A);
 
         $text = $header.$rows.$footer;
     }