From 3f4521bcf4b538b6ac54817cfad22b51e347546d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 17 Jun 2015 03:03:03 -0400
Subject: [PATCH] Fix so plain text signature field uses monospace font (#1490435)
---
program/lib/Roundcube/rcube_plugin.php | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
index 01c340d..e240448 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -71,6 +71,7 @@
protected $home;
protected $urlbase;
private $mytask;
+ private $loaded_config = array();
/**
@@ -94,7 +95,15 @@
/**
* Provide information about this
*
- * @return array Meta information about a plugin or false if not implemented
+ * @return array Meta information about a plugin or false if not implemented:
+ * As hash array with the following keys:
+ * name: The plugin name
+ * vendor: Name of the plugin developer
+ * version: Plugin version name
+ * license: License name (short form according to http://spdx.org/licenses/)
+ * uri: The URL to the plugin homepage or source repository
+ * src_uri: Direct download URL to the source code of this plugin
+ * require: List of plugins required for this one (as array of plugin names)
*/
public static function info()
{
@@ -113,6 +122,17 @@
}
/**
+ * Attempt to load the given plugin which is optional for the current plugin
+ *
+ * @param string Plugin name
+ * @return boolean True on success, false on failure
+ */
+ public function include_plugin($plugin_name)
+ {
+ return $this->api->load_plugin($plugin_name, true, false);
+ }
+
+ /**
* Load local config file from plugins directory.
* The loaded values are patched over the global configuration.
*
@@ -122,6 +142,12 @@
*/
public function load_config($fname = 'config.inc.php')
{
+ if (in_array($fname, $this->loaded_config)) {
+ return true;
+ }
+
+ $this->loaded_config[] = $fname;
+
$fpath = $this->home.'/'.$fname;
$rcube = rcube::get_instance();
@@ -396,7 +422,7 @@
$rcube = rcube::get_instance();
$skins = array_keys((array)$rcube->output->skins);
if (empty($skins)) {
- $skins = array($rcube->config->get('skin'));
+ $skins = (array) $rcube->config->get('skin');
}
foreach ($skins as $skin) {
$skin_path = 'skins/' . $skin;
--
Gitblit v1.9.1