From cb2bc809ef29f349d38c89e202d821e67bb4c947 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 21 Sep 2010 14:47:55 -0400
Subject: [PATCH] Fix db_mode check in insert_id()
---
program/include/rcube_plugin.php | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 8001c4c..c92b58e 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -22,7 +22,7 @@
/**
* Plugin interface class
*
- * @package Core
+ * @package PluginAPI
*/
abstract class rcube_plugin
{
@@ -31,6 +31,7 @@
public $task;
protected $home;
protected $urlbase;
+ private $mytask;
/**
* Default constructor.
@@ -134,19 +135,8 @@
*/
public function register_task($task)
{
- if ($task != asciiwords($task)) {
- raise_error(array('code' => 526, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Invalid task name: $task. Only characters [a-z0-9_.-] are allowed"), true, false);
- }
- else if (in_array(rcmail::$main_tasks, $task)) {
- raise_error(array('code' => 526, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Cannot register taks $task; already taken by another plugin or the application itself"), true, false);
- }
- else {
- rcmail::$main_tasks[] = $task;
- }
+ if ($this->api->register_task($task, $this->ID))
+ $this->mytask = $task;
}
/**
@@ -159,7 +149,7 @@
*/
public function register_action($action, $callback)
{
- $this->api->register_action($action, $this->ID, $callback);
+ $this->api->register_action($action, $this->ID, $callback, $this->mytask);
}
/**
--
Gitblit v1.9.1