- Applied fixes from trunk up to r5498

alecpl

2011-11-28 77449d011b2367a9f3d7bb179534aa09865aa26e

 program/steps/addressbook/func.inc

@@ -705,7 +705,7 @@
    $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));