Changeset 6092 in subversion for trunk/roundcubemail/program/include/rcube.php

Timestamp:

Apr 16, 2012 7:59:08 AM (14 months ago)

Author:

alec

Message:

• Replace some references to rcmail with rcube

File:

• trunk/roundcubemail/program/include/rcube.php (modified) (5 diffs)

trunk/roundcubemail/program/include/rcube.php

@@ -3 +3 @@
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcmail.php                                            |
+ | program/include/rcube.php                                             |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
@@ -37 +37 @@
 
   /**
-   * Singleton instace of rcmail
+   * Singleton instace of rcube
    *
    * @var rcmail
@@ -110 +110 @@
    * This implements the 'singleton' design pattern
    *
-   * @return rcmail The one and only instance
+   * @return rcube The one and only instance
    */
   static function get_instance()
@@ -719 +719 @@
     /*-
      * Trim PHP's padding and the canary byte; see note in
-     * rcmail::encrypt() and http://php.net/mcrypt_generic#68082
+     * rcube::encrypt() and http://php.net/mcrypt_generic#68082
      */
     $clear = substr(rtrim($clear, "\0"), 0, -1);
@@ -849 +849 @@
         $args = func_get_args();
 
-        if (class_exists('rcmail', false)) {
+        if (class_exists('rcube', false)) {
             $rcube = self::get_instance();
-            if (is_object($rcube->plugins)) {
-                $plugin = $rcube->plugins->exec_hook('console', array('args' => $args));
-                if ($plugin['abort']) {
-                    return;
-                }
-               $args = $plugin['args'];
+            $plugin = $rcube->plugins->exec_hook('console', array('args' => $args));
+            if ($plugin['abort']) {
+                return;
             }
+           $args = $plugin['args'];
         }