diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-03-24 17:30:34 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-03-24 17:30:34 +0100 |
| commit | 24e88e91f7ebac132fa356762b0cd544d42cef9f (patch) | |
| tree | 3b99b6c2237fb26541a133f78405faffcddd5240 /program/include | |
| parent | a26c031621410f030751eae404490a10498583d7 (diff) | |
| parent | 7889c57b772dbf722639894bd572c767424c8b84 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail_output_html.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 6100269b9..d8996edbf 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -873,6 +873,7 @@ class rcmail_output_html extends rcmail_output // include a file case 'include': $old_base_path = $this->base_path; + if (!empty($attrib['skin_path'])) $attrib['skinpath'] = $attrib['skin_path']; if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skinpath'])) { $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin) $path = realpath($path); |