Fixed bug #497181

http://sf.net/tracker/?func=detail&atid=100311&aid=497181&group_id=311

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1998 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index e365aa55c10add633f82658d14c50d7a63ef9390..e4da669ad09c0f2a49f40cddb10873c18e3747e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Version 1.2.2 -- ??
   - Changed conf.pl invocation from '#/usr/bin/perl' to
     '#!/usr/bin/env perl' to help people who have perl somewhere
     else. (Bug #496753)
   - Changed conf.pl invocation from '#/usr/bin/perl' to
     '#!/usr/bin/env perl' to help people who have perl somewhere
     else. (Bug #496753)

+  - Fixed sorting of folder list, bug #497181

        
 Version 1.2.1 -- 25 December 2001
 ---------------------------------
        
 Version 1.2.1 -- 25 December 2001
 ---------------------------------

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 770186fce97f655436e0af143a2c7948e121e4ca..9fad2e842663efddc4bb550d7417775924f4d8bd 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -251,9 +251,9 @@ function user_strcasecmp($a, $b) {
         if (($a_del == $delimiter) && ($b_del == $delimiter)) {
             $result = 0;
         } else if (($a_del == $delimiter) && ($b_del != $delimiter)) {
         if (($a_del == $delimiter) && ($b_del == $delimiter)) {
             $result = 0;
         } else if (($a_del == $delimiter) && ($b_del != $delimiter)) {

-            $result = 1;
-        } else if (($a_del != $delimiter) && ($b_del == $delimiter)) {

             $result = -1;
             $result = -1;

+        } else if (($a_del != $delimiter) && ($b_del == $delimiter)) {
+            $result = 1;

         } else {
             $result = strcasecmp($a{$c}, $b{$c});
         }
         } else {
             $result = strcasecmp($a{$c}, $b{$c});
         }