The first entry has to be called 'default'.

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

diff --git a/functions/identity.php b/functions/identity.php
index 3977ac2a7f430b9c2a432b07b2e34563dda5b48a..3cf24538c53d935e596e7c826a6cb05159273b5c 100644 (file)
--- a/functions/identity.php
+++ b/functions/identity.php
@@ -29,15 +29,16 @@ function get_identities() {
     $num_ids = getPref($data_dir,$username,'identities');
     $identities = array();
     /* We always have this one, even if the user doesn't use multiple identities */
     $num_ids = getPref($data_dir,$username,'identities');
     $identities = array();
     /* We always have this one, even if the user doesn't use multiple identities */

-    $identities[] = array('full_name' => getPref($data_dir,$username,'full_name'),
+    $identities['default'] = array('full_name' => getPref($data_dir,$username,'full_name'),

         'email_address' => getPref($data_dir,$username,'email_address'),
         'reply_to' => getPref($data_dir,$username,'reply_to'),
         'signature' => getSig($data_dir,$username,'g'),
         'index' => 0 );
 
     /* If there are any others, add them to the array */
         'email_address' => getPref($data_dir,$username,'email_address'),
         'reply_to' => getPref($data_dir,$username,'reply_to'),
         'signature' => getSig($data_dir,$username,'g'),
         'index' => 0 );
 
     /* If there are any others, add them to the array */

-    if (!empty($num_ids) && $num_ids > 1) {                                                                 for ($i=1;$i<$num_ids;$i++) {
-            $identities[] = array('full_name' => getPref($data_dir,$username,'full_name' . $i),
+    if (!empty($num_ids) && $num_ids > 1) {
+        for ($i=1;$i<$num_ids;$i++) {
+            $identities[$i] = array('full_name' => getPref($data_dir,$username,'full_name' . $i),

             'email_address' => getPref($data_dir,$username,'email_address' . $i),
             'reply_to' => getPref($data_dir,$username,'reply_to' . $i),
             'signature' => getSig($data_dir,$username,$i),
             'email_address' => getPref($data_dir,$username,'email_address' . $i),
             'reply_to' => getPref($data_dir,$username,'reply_to' . $i),
             'signature' => getSig($data_dir,$username,$i),