From e86a21bd83a0ae6cadfe9c919582951f306d3b64 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 06 Jan 2012 05:55:07 -0500
Subject: [PATCH] - Fix typo in timezone handling, more exception catching
---
program/include/rcube_plugin.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 0979137..49bec04 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -147,8 +147,11 @@
ob_start();
foreach (array('en_US', $lang) as $lng) {
- @include($locdir . $lng . '.inc');
- $texts = (array)$labels + (array)$messages + (array)$texts;
+ $fpath = $locdir . $lng . '.inc';
+ if (is_file($fpath) && is_readable($fpath)) {
+ include($fpath);
+ $texts = (array)$labels + (array)$messages + (array)$texts;
+ }
}
ob_end_clean();
@@ -283,14 +286,14 @@
else
return $fn;
}
-
+
/**
* Provide path to the currently selected skin folder within the plugin directory
* with a fallback to the default skin folder.
*
* @return string Skin path relative to plugins directory
*/
- protected function local_skin_path()
+ public function local_skin_path()
{
$skin_path = 'skins/'.$this->api->config->get('skin');
if (!is_dir(realpath(slashify($this->home) . $skin_path)))
--
Gitblit v1.9.1