summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-11-25 18:50:05 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-11-25 18:50:05 +0000
commite6de9961b20c079d0a11624659d220cf93cf233c (patch)
tree0846be629db93062f8980691498e330e1685c724 /roundcubemail/program
parent28a60f6bee5ecbec21e4bb4ed74750c42e7f1975 (diff)
- Fix handling contact photo url with https:// prefix (#1488202)
git-svn-id: https://svn.roundcube.net/trunk@5492 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/steps/addressbook/func.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc
index 52819c0df..5010e8c22 100644
--- a/roundcubemail/program/steps/addressbook/func.inc
+++ b/roundcubemail/program/steps/addressbook/func.inc
@@ -710,7 +710,7 @@ function rcmail_contact_photo($attrib)
$RCMAIL->output->set_env('photo_placeholder', $photo_img);
unset($attrib['placeholder']);
- if (strpos($record['photo'], 'http:') === 0)
+ if (preg_match('!^https?://!i', $record['photo']))
$photo_img = $record['photo'];
else if ($record['photo'])
$photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID));