Changeset 2002


Ignore:
Timestamp:
02/11/10 08:04:39 (14 years ago)
Author:
amuller
Message:

Ticket #490 - #690 - Merge branches Expresso 2.2 com Trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/expressoMail1_2/inc/class.imap_functions.inc.php

    r1969 r2002  
    450450                $return = array(); 
    451451                $msg_number = $params['msg_number']; 
    452                 if(preg_match('(.+)(_[a-zA-Z0-9]+)',$msg_number,$matches)) { //Verifies if it comes from a tab diferent of the main one. 
     452                if(@preg_match('(.+)(_[a-zA-Z0-9]+)',$msg_number,$matches)) { //Verifies if it comes from a tab diferent of the main one. 
    453453                        $msg_number = $matches[1]; 
    454454                        $plus_id = $matches[2]; 

  • trunk/phpgwapi/inc/class.preferences.inc.php

    r2001 r2002  
    223223                        } 
    224224                        $groups = $GLOBALS['phpgw']->accounts->membership(); 
     225                        if (is_array($groups)) 
    225226                        foreach($groups as $group) 
    226227                                $gids .= ",".$group['account_id']; 
Note: See TracChangeset for help on using the changeset viewer.