Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-03 06:44:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix skin extending for assets (#5115)

Browse Source 
Remove redundant is_file() calls.
This commit is contained in:
Aleksander Machniak
2018-04-15 12:21:56 +02:00
parent 5ce5f9a8bc
commit ecde98729b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -68,6 +68,7 @@ CHANGELOG Roundcube Webmail
- Handle inline images also inside multipart/mixed messages (#5905)
- Allow style tags in HTML editor on composed/reply messages (#5751)
- Use Github API as a fallback to fetch js dependencies to workaround throttling issues (#6248)
- Fix skin extending for assets (#5115)
- Fix handling of forwarded messages inside of a TNEF message (#5632)
- Fix bug where attachment size wasn't visible when the filename was too long (#6033)
- Fix checking table columns when there's more schemas/databases in postgres/mysql (#6047)

11
program/include/rcmail_output_html.php
View File

@@ -349,16 +349,12 @@ EOF;
}
foreach ($skin_paths as $skin_path) {
$path = realpath(RCUBE_INSTALL_PATH . $skin_path . $file);
if ($path && is_file($path)) {
if (realpath(RCUBE_INSTALL_PATH . $skin_path . $file)) {
return $skin_path . $file;
}
if ($this->assets_dir != RCUBE_INSTALL_PATH) {
$path = realpath($this->assets_dir . $skin_path . $file);
if ($path && is_file($path)) {
if (realpath($this->assets_dir . $skin_path . $file)) {
return $skin_path . $file;
}
}
@@ -833,7 +829,8 @@ EOF;
// correct absolute paths
if ($file[0] == '/') {
$file = $this->base_path . $file;
$this->get_skin_file($file, $skin_path);
$file = $skin_path . $file;
}
// add file modification timestamp