File roundcubemail-1.1-assets.patch of Package roundcubemail

File roundcubemail-1.1-assets.patch of Package roundcubemail (Revision 25)

Currently displaying revision 25 , Show latest

commit 21b9c3b6c012822b60a8fb4cb9a59247eaa2d156
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
Date:   Thu Aug 28 18:56:15 2014 +0200

Allow assets to be entirely separated from the main Roundcube program facilities.

diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index a848246..d196ec1 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -263,6 +263,14 @@ EOF;
             if (is_file($path)) {
                 return $skin_path . $file;
             }
+
+            $path = rtrim(RCUBE_INSTALL_PATH, '/');
+            $path .= '/' . $skin_path . $file;
+            $path = realpath($path);
+
+            if ($skin_path[0] != '/' && is_file($path)) {
+                return $path;
+            }
         }
 
         return false;
@@ -503,6 +511,10 @@ EOF;
                 }
             }
 
+            if (!is_readable($path) && $path[0] != '/' && is_readable(rtrim(RCUBE_INSTALL_PATH, '/') . '/' . $path)) {
+                $path = rtrim(RCUBE_INSTALL_PATH, '/') . '/' . $path;
+            }
+
             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)