From c3dabfad7ac668cb9bdcbf8ccf221d82fadd9c9c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 29 Jun 2011 13:15:08 -0400
Subject: [PATCH] - Fixed link to contact photo, when browsing the search results (#1487980)
---
program/steps/addressbook/edit.inc | 1 +
program/steps/addressbook/func.inc | 4 ++--
program/steps/addressbook/show.inc | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 05572de..3916112 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -53,6 +53,7 @@
$CONTACTS = rcmail_contact_source($source, true);
}
+$SOURCE_ID = $source;
function rcmail_get_edit_record()
{
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 2cb2b8a..d0be00d 100644
--- a/program/steps/addressbook/func.inc
+++ b/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
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index 36aff31..fc983e6 100644
--- a/program/steps/addressbook/show.inc
+++ b/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))) {
--
Gitblit v1.9.1