Changeset 2583 in subversion

Timestamp:

May 31, 2009 7:40:07 AM (4 years ago)

Author:

alec

Message:

• don't register body handler on plugin init (#1485888)

Location:

trunk/roundcubemail/plugins

Files:

• password/password.php (modified) (2 diffs)
• sasl_password/sasl_password.php (modified) (3 diffs)

trunk/roundcubemail/plugins/password/password.php

@@ -91 +91 @@
     $this->register_action('plugin.password', array($this, 'password_init'));
     $this->register_action('plugin.password-save', array($this, 'password_save'));
+    $this->include_script('password.js');
+  }
+
+  function password_init()
+  {
+    $this->add_texts('localization/');
     $this->register_handler('plugin.body', array($this, 'password_form'));
-    $this->include_script('password.js');
-  }
-
-  function password_init()
-  {
-    $this->add_texts('localization/');
+
     $rcmail = rcmail::get_instance();
     $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
@@ -108 +109 @@
 
     $this->add_texts('localization/');
+    $this->register_handler('plugin.body', array($this, 'password_form'));
+    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
+
     $confirm = $rcmail->config->get('password_confirm_current');
-    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
 
     if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd']))

trunk/roundcubemail/plugins/sasl_password/sasl_password.php

@@ -27 +27 @@
     $this->register_action('plugin.saslpassword', array($this, 'password_init'));
     $this->register_action('plugin.saslpassword-save', array($this, 'password_save'));
-    $this->register_handler('plugin.body', array($this, 'password_form'));
     $this->include_script('sasl_password.js');
   }
@@ -34 +33 @@
   {
     $this->add_texts('locale/');
+    $this->register_handler('plugin.body', array($this, 'password_form'));
+
     $rcmail = rcmail::get_instance();
     $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
@@ -44 +45 @@
 
     $this->add_texts('locale/');
+    $this->register_handler('plugin.body', array($this, 'password_form'));
 
     if (!isset($_POST['_curpasswd']) || !isset($_POST['_newpasswd'])) {