diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2012-07-30 12:08:58 +0200 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2012-07-30 12:08:58 +0200 |
commit | 6843acc9fced3dc1261e019ad4552b6e4c340ec7 (patch) | |
tree | 67d4f85b6b99d49f1ad28aa98fca213b6962fd7d /program/steps/addressbook | |
parent | 9f1652e29e2ed8be815cae4abf42bde989ffeb22 (diff) | |
parent | 6d1253681547343dcffb398a7e485bfb70087b57 (diff) |
Merged changes to skin folders
Diffstat (limited to 'program/steps/addressbook')
-rw-r--r-- | program/steps/addressbook/func.inc | 4 | ||||
-rw-r--r-- | program/steps/addressbook/show.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index a612d7c11..8abf061b8 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -368,7 +368,7 @@ function rcmail_contact_frame($attrib) $attrib['name'] = $attrib['id']; $OUTPUT->set_env('contentframe', $attrib['name']); - $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif'); + $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif'); return html::iframe($attrib); } @@ -705,7 +705,7 @@ function rcmail_contact_photo($attrib) if ($result = $CONTACTS->get_result()) $record = $result->first(); - $photo_img = $attrib['placeholder'] ? $CONFIG['skin_path'] . $attrib['placeholder'] : 'program/blank.gif'; + $photo_img = $attrib['placeholder'] ? $CONFIG['skin_path'] . $attrib['placeholder'] : 'program/resources/blank.gif'; $RCMAIL->output->set_env('photo_placeholder', $photo_img); unset($attrib['placeholder']); diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index d7f6f8f1d..48e37256d 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -85,7 +85,7 @@ if ($RCMAIL->action == 'photo') { $RCMAIL->output->future_expire_header(86400); header('Content-Type: ' . rc_image_content_type($data)); - echo $data ? $data : file_get_contents('program/blank.gif'); + echo $data ? $data : file_get_contents('program/resources/blank.gif'); exit; } |