- Rename hooks: contact_save -> contact_update, identity_save -> identity_update, delete_identity -> identity_delete

- Print warning to the log about deprecated hook names usage


git-svn-id: https://svn.roundcube.net/trunk@3883 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcube_plugin_api.php b/roundcubemail/program/include/rcube_plugin_api.php
index 7fe0d4f34..692b0c7cf 100644
--- a/roundcubemail/program/include/rcube_plugin_api.php
+++ b/roundcubemail/program/include/rcube_plugin_api.php
@@ -58,7 +58,8 @@ class rcube_plugin_api
     'address_sources'   => 'addressbooks_list',
     'get_address_book'  => 'addressbook_get',
     'create_contact'    => 'contact_create',
-    'save_contact'      => 'contact_save',
+    'save_contact'      => 'contact_update',
+    'contact_save'      => 'contact_update',
     'delete_contact'    => 'contact_delete',
     'manage_folders'    => 'folders_list',
     'list_mailboxes'    => 'mailboxes_list',
@@ -67,7 +68,9 @@ class rcube_plugin_api
     'list_prefs_sections' => 'preferences_sections_list',
     'list_identities'   => 'identities_list',
     'create_identity'   => 'identity_create',
-    'save_identity'     => 'identity_save',
+    'delete_identity'   => 'identity_delete',
+    'save_identity'     => 'identity_update',
+    'identity_save'     => 'identity_update',
   );
 
   /**
@@ -193,11 +196,9 @@ class rcube_plugin_api
   {
     if (is_callable($callback)) {
       if (isset($this->deprecated_hooks[$hook])) {
-        /* Uncoment after 0.4-stable release
         raise_error(array('code' => 522, 'type' => 'php',
           'file' => __FILE__, 'line' => __LINE__,
           'message' => "Deprecated hook name. ".$hook.' -> '.$this->deprecated_hooks[$hook]), true, false);
-        */
         $hook = $this->deprecated_hooks[$hook];
       }
       $this->handlers[$hook][] = $callback;