From adc0bf01f55ac84cfad47f1530f6e3e0319b58fe Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 29 May 2009 03:45:40 -0400
Subject: [PATCH] - allow empty identity name (#1485863)
---
program/include/rcube_plugin_api.php | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
index 4780f2e..5103ce1 100644
--- a/program/include/rcube_plugin_api.php
+++ b/program/include/rcube_plugin_api.php
@@ -61,8 +61,7 @@
*/
private function __construct()
{
- $rcmail = rcmail::get_instance();
- $this->dir = realpath($rcmail->config->get('plugins_dir'));
+ $this->dir = INSTALL_PATH . $this->url;
}
@@ -264,7 +263,7 @@
public function include_script($fn)
{
if ($this->output->type == 'html') {
- $src = $this->ressource_url($fn);
+ $src = $this->resource_url($fn);
$this->output->add_header(html::tag('script', array('type' => "text/javascript", 'src' => $src)));
}
}
@@ -275,7 +274,7 @@
public function include_stylesheet($fn)
{
if ($this->output->type == 'html') {
- $src = $this->ressource_url($fn);
+ $src = $this->resource_url($fn);
$this->output->add_header(html::tag('link', array('rel' => "stylesheet", 'type' => "text/css", 'href' => $src)));
}
}
@@ -300,9 +299,9 @@
/**
* Make the given file name link into the plugins directory
*/
- private function ressource_url($fn)
+ private function resource_url($fn)
{
- if ($fn[0] != '/' && !eregi('^https?://', $fn))
+ if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn))
return $this->url . $fn;
else
return $fn;
--
Gitblit v1.9.1