Changeset 4892 in subversion


Ignore:
Timestamp:
Jun 29, 2011 1:15:08 PM (2 years ago)
Author:
alec
Message:
  • Fixed link to contact photo, when browsing the search results (#1487980)
Location:
trunk/roundcubemail/program/steps/addressbook
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/program/steps/addressbook/edit.inc

    r4850 r4892  
    5454} 
    5555 
     56$SOURCE_ID = $source; 
    5657 
    5758function rcmail_get_edit_record() 

  • trunk/roundcubemail/program/steps/addressbook/func.inc

    r4884 r4892  
    620620function rcmail_contact_photo($attrib) 
    621621{ 
    622     global $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG; 
     622    global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG; 
    623623 
    624624    if (!$CONTACT_COLTYPES['photo']) 
    … …  
    635635        $photo_img = $record['photo']; 
    636636    else if ($record['photo']) 
    637         $photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $_REQUEST['_source'])); 
     637        $photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID)); 
    638638    else 
    639639        $ff_value = '-del-'; // will disable delete-photo action 

  • trunk/roundcubemail/program/steps/addressbook/show.inc

    r4857 r4892  
    2626 
    2727// Initialize addressbook source 
    28 $CONTACTS = rcmail_contact_source($source, true); 
     28$CONTACTS  = rcmail_contact_source($source, true); 
     29$SOURCE_ID = $source; 
    2930 
    3031// read contact record 
Note: See TracChangeset for help on using the changeset viewer.