diff options
| -rw-r--r-- | program/include/rcube_output_html.php | 2 | ||||
| -rw-r--r-- | program/steps/addressbook/show.inc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php index e67a4919a..d80d28a9b 100644 --- a/program/include/rcube_output_html.php +++ b/program/include/rcube_output_html.php @@ -855,7 +855,7 @@ class rcube_output_html extends rcube_output // include a file case 'include': $old_base_path = $this->base_path; - if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skin_path'])) { + if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skinpath'])) { $this->base_path = $skin_path; $path = realpath($path); } diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index 48e37256d..16be89f94 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -5,7 +5,7 @@ | program/steps/addressbook/show.inc | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2009, The Roundcube Dev Team | + | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -32,6 +32,7 @@ $SOURCE_ID = $source; if ($cid && ($record = $CONTACTS->get_record($cid, true))) { $OUTPUT->set_env('readonly', $CONTACTS->readonly || $record['readonly']); $OUTPUT->set_env('cid', $record['ID']); + $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false)); } // get address book name (for display) |