- Fixed link to contact photo, when browsing the search results (#1487980)

alecpl

2011-06-29 c3dabfad7ac668cb9bdcbf8ccf221d82fadd9c9c

- Fixed link to contact photo, when browsing the search results (#1487980)

 program/steps/addressbook/edit.inc

@@ -53,6 +53,7 @@
    $CONTACTS = rcmail_contact_source($source, true);
}

$SOURCE_ID = $source;

function rcmail_get_edit_record()
{

 program/steps/addressbook/func.inc

@@ -619,7 +619,7 @@

function rcmail_contact_photo($attrib)
{
    global $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG;
    global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG;

    if (!$CONTACT_COLTYPES['photo'])
        return '';
@@ -634,7 +634,7 @@
    if (strpos($record['photo'], 'http:') === 0)
        $photo_img = $record['photo'];
    else if ($record['photo'])
        $photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $_REQUEST['_source']));
        $photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID));
    else
        $ff_value = '-del-'; // will disable delete-photo action


 program/steps/addressbook/show.inc

@@ -25,7 +25,8 @@
$cid    = array_shift($cids[$source]);

// Initialize addressbook source
$CONTACTS = rcmail_contact_source($source, true);
$CONTACTS  = rcmail_contact_source($source, true);
$SOURCE_ID = $source;

// read contact record
if ($cid && ($record = $CONTACTS->get_record($cid, true))) {