From 7079110c61d41020912baab91cef8b3a3acdb577 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 08 May 2014 09:08:45 -0400
Subject: [PATCH] Allow data-* attributes (#1489860)
---
program/lib/Roundcube/rcube_plugin.php | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
index 0dd575a..01c340d 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -3,7 +3,7 @@
/*
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2012, The Roundcube Dev Team |
+ | Copyright (C) 2008-2014, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -133,15 +133,8 @@
return false;
}
else if (!$is_local) {
- $fname = $this->ID . '.inc.php';
// Search plugin_name.inc.php file in any configured path
- if (!$rcube->config->load_from_file($fname)) {
- rcube::raise_error(array(
- 'code' => 527, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Failed to load $fname config file from any configured path"), true, false);
- return false;
- }
+ return $rcube->config->load_from_file($this->ID . '.inc.php');
}
return true;
@@ -401,7 +394,11 @@
public function local_skin_path()
{
$rcube = rcube::get_instance();
- foreach (array($rcube->config->get('skin'), 'larry') as $skin) {
+ $skins = array_keys((array)$rcube->output->skins);
+ if (empty($skins)) {
+ $skins = array($rcube->config->get('skin'));
+ }
+ foreach ($skins as $skin) {
$skin_path = 'skins/' . $skin;
if (is_dir(realpath(slashify($this->home) . $skin_path))) {
break;
--
Gitblit v1.9.1