From 996af3bfd9bfcac84396790a9a215d177b17c79e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 7 Dec 2012 11:13:11 +0100
Subject: Some more rcmail -> rcube cleanup

---
 program/lib/Roundcube/rcube_plugin.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 dbb15e8be..5db85025d 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -203,23 +203,23 @@ abstract class rcube_plugin
       foreach ($texts as $key => $value)
         $add[$domain.'.'.$key] = $value;
 
-      $rcmail = rcube::get_instance();
-      $rcmail->load_language($lang, $add);
+      $rcube = rcube::get_instance();
+      $rcube->load_language($lang, $add);
 
       // add labels to client
       if ($add2client) {
         $js_labels = is_array($add2client) ? array_map(array($this, 'label_map_callback'), $add2client) : array_keys($add);
-        $rcmail->output->add_label($js_labels);
+        $rcube->output->add_label($js_labels);
       }
     }
   }
 
   /**
-   * Wrapper for rcmail::gettext() adding the plugin ID as domain
+   * Wrapper for rcube::gettext() adding the plugin ID as domain
    *
    * @param string $p Message identifier
    * @return string Localized text
-   * @see rcmail::gettext()
+   * @see rcube::gettext()
    */
   public function gettext($p)
   {
@@ -336,8 +336,8 @@ abstract class rcube_plugin
    */
   public function local_skin_path()
   {
-    $rcmail = rcube::get_instance();
-    foreach (array($rcmail->config->get('skin'), 'larry') as $skin) {
+    $rcube = rcube::get_instance();
+    foreach (array($rcube->config->get('skin'), 'larry') as $skin) {
       $skin_path = 'skins/' . $skin;
       if (is_dir(realpath(slashify($this->home) . $skin_path)))
         break;
-- 
cgit v1.2.3