Changeset 86135e2b in github


Ignore:
Timestamp:
May 30, 2012 5:35:57 AM (13 months ago)
Author:
Thomas Bruederli <thomas@…>
Branches:
release-0.8
Children:
1784ae4
Parents:
d8ff4c2
git-author:
Thomas Bruederli <thomas@…> (05/30/12 05:35:28)
git-committer:
Thomas Bruederli <thomas@…> (05/30/12 05:35:57)
Message:

Don't show errors when moving contacts into groups they're already in (#1488493)

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    rd8ff4c2 r86135e2b  
    22=========================== 
    33 
     4- Don't show errors when moving contacts into groups they are already in (#1488493) 
    45- Make folders with unread messages in subfolders bold again (#1486793) 
    56- Abbreviate long attachment file names with ellipsis (#1488499) 

  • program/include/rcube_contacts.php

    r66d2152 r86135e2b  
    938938            ); 
    939939 
    940             if (!$this->db->db_error) 
     940            if ($this->db->db_error) 
     941                $this->set_error(self::ERROR_SAVING, $this->db->db_error_msg); 
     942            else 
    941943                $added++; 
    942944        } 

  • program/localization/de_CH/messages.inc

    ra9c1b87 r86135e2b  
    116116$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefÃŒgt.'; 
    117117$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.'; 
     118$messages['nogroupassignmentschanged'] = 'Es wurde keine Gruppenzuweisung verÀndert.'; 
    118119$messages['importwait'] = 'Daten werden importiert, bitte warten...'; 
    119120$messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.'; 

  • program/localization/de_DE/messages.inc

    rab0b3b03 r86135e2b  
    114114$messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefÃŒgt.'; 
    115115$messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.'; 
     116$messages['nogroupassignmentschanged'] = 'Es wurde keine Gruppenzuweisung verÀndert.'; 
    116117$messages['importwait'] = 'Daten werden importiert, bitte warten...'; 
    117118$messages['importerror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist nicht im vCard-Format.'; 

  • program/localization/en_US/messages.inc

    ra9c1b87 r86135e2b  
    122122$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.'; 
    123123$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.'; 
     124$messages['nogroupassignmentschanged'] = 'No group assignments changed.'; 
    124125$messages['importwait'] = 'Importing, please wait...'; 
    125126$messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.'; 

  • program/steps/addressbook/groups.inc

    r1ba07f0 r86135e2b  
    5151    if ($result) 
    5252      $OUTPUT->show_message('contactaddedtogroup'); 
     53    else if ($plugin['abort'] || $CONTACTS->get_error()) 
     54      $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error'); 
    5355    else 
    54       $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error'); 
     56      $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'nogroupassignmentschanged'); 
    5557  } 
    5658} 
Note: See TracChangeset for help on using the changeset viewer.