From 59478e06c25303a790a0840ab2ac30662c4ef781 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <root@paranoid>
Date: Tue, 5 Aug 2014 16:46:22 +0200
Subject:  c'est la merde..

---
 program/lib/Roundcube/rcube_plugin.php | 36 ++--------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

(limited to 'program/lib/Roundcube/rcube_plugin.php')

diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
index 3153a8410..34720cfd7 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -91,16 +91,6 @@ abstract class rcube_plugin
      */
     abstract function init();
 
-    /**
-     * Provide information about this
-     *
-     * @return array Meta information about a plugin or false if not implemented
-     */
-    public static function info()
-    {
-        return false;
-    }
-
     /**
      * Attempt to load the given plugin which is required for the current plugin
      *
@@ -227,7 +217,7 @@ abstract class rcube_plugin
             $rcube->load_language($lang, $add);
 
             // add labels to client
-            if ($add2client && method_exists($rcube->output, 'add_label')) {
+            if ($add2client) {
                 if (is_array($add2client)) {
                     $js_labels = array_map(array($this, 'label_map_callback'), $add2client);
                 }
@@ -239,24 +229,6 @@ abstract class rcube_plugin
         }
     }
 
-    /**
-     * Wrapper for add_label() adding the plugin ID as domain
-     */
-    public function add_label()
-    {
-        $rcube = rcube::get_instance();
-
-        if (method_exists($rcube->output, 'add_label')) {
-            $args = func_get_args();
-            if (count($args) == 1 && is_array($args[0])) {
-                $args = $args[0];
-            }
-
-            $args = array_map(array($this, 'label_map_callback'), $args);
-            $rcube->output->add_label($args);
-        }
-    }
-
     /**
      * Wrapper for rcube::gettext() adding the plugin ID as domain
      *
@@ -273,7 +245,7 @@ abstract class rcube_plugin
     /**
      * Register this plugin to be responsible for a specific task
      *
-     * @param string $task Task name (only characters [a-z0-9_-] are allowed)
+     * @param string $task Task name (only characters [a-z0-9_.-] are allowed)
      */
     public function register_task($task)
     {
@@ -408,10 +380,6 @@ abstract class rcube_plugin
      */
     private function label_map_callback($key)
     {
-        if (strpos($key, $this->ID.'.') === 0) {
-            return $key;
-        }
-
         return $this->ID.'.'.$key;
     }
 }
-- 
cgit v1.2.3