diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/iniset.php | 4 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php index be71fc084..c166c575c 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -5,7 +5,7 @@ | program/include/iniset.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2008-2012, The Roundcube Dev Team | + | Copyright (C) 2008-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -21,7 +21,7 @@ */ // application constants -define('RCMAIL_VERSION', '0.9-git'); +define('RCMAIL_VERSION', '0.9-beta'); define('RCMAIL_START', microtime(true)); $config = array( diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 76342c245..d4a1654f1 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -462,6 +462,7 @@ class rcmail_output_html extends rcmail_output if (is_readable($path)) { $this->config->set('skin_path', $skin_path); $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin) + $skin_dir = preg_replace('!^plugins/!', '', $skin_path); break; } else { @@ -643,6 +644,7 @@ class rcmail_output_html extends rcmail_output protected function file_callback($matches) { $file = $matches[3]; + $file[0] = preg_replace('!^/this/!', '/', $file[0]); // correct absolute paths if ($file[0] == '/') { |