Changeset 5782 in subversion

Timestamp:

Jan 16, 2012 10:23:40 AM (16 months ago)

Author:

thomasb

Message:

Run imap_init plugin hook as deprecated hook; set $_SESSIONimap_host? for backwards compat.

Location:

trunk/roundcubemail/program/include

Files:

• rcmail.php (modified) (1 diff)
• rcube_plugin_api.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcmail.php

@@ -683 +683 @@
       $options['ssl']      = $_SESSION['storage_ssl'];
       $options['password'] = $this->decrypt($_SESSION['password']);
+      // set 'imap_host' for backwards compatibility
+      $_SESSION[$driver.'_host'] = &$_SESSION['storage_host'];
     }
 
     $options = $this->plugins->exec_hook("storage_init", $options);
-
-    // for backward compat. (deprecated, to be removed)
-    $options = $this->plugins->exec_hook("imap_init", $options);
 
     $this->storage->set_options($options);

trunk/roundcubemail/program/include/rcube_plugin_api.php

@@ -72 +72 @@
     'save_identity'     => 'identity_update',
     'identity_save'     => 'identity_update',
+    'imap_init'         => 'storage_init',
   );