From d5d968048601fa1d519f7cfee11f23918afc186c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 26 Jul 2010 04:11:43 -0400
Subject: [PATCH] - Fix double slash in plugin directory path (#1486872)
---
index.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/index.php b/index.php
index 43cf7c4..6a9a748 100644
--- a/index.php
+++ b/index.php
@@ -242,9 +242,13 @@
while ($redirects < 5) {
$stepfile = !empty($action_map[$RCMAIL->task][$RCMAIL->action]) ?
$action_map[$RCMAIL->task][$RCMAIL->action] : strtr($RCMAIL->action, '-', '_') . '.inc';
-
+
// execute a plugin action
- if (preg_match('/^plugin\./', $RCMAIL->action)) {
+ if ($RCMAIL->plugins->is_plugin_task($RCMAIL->task)) {
+ $RCMAIL->plugins->exec_action($RCMAIL->task.'.'.$RCMAIL->action);
+ break;
+ }
+ else if (preg_match('/^plugin\./', $RCMAIL->action)) {
$RCMAIL->plugins->exec_action($RCMAIL->action);
break;
}
@@ -270,5 +274,4 @@
'line' => __LINE__,
'file' => __FILE__,
'message' => "Invalid request"), true, true);
-
-?>
+
--
Gitblit v1.9.1