From d257c4064f68d3c43ca3330b466eb4d7eaaa1165 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 31 May 2009 11:40:07 +0000
Subject: - don't register body handler on plugin init (#1485888)

---
 plugins/password/password.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins/password/password.php')

diff --git a/plugins/password/password.php b/plugins/password/password.php
index 0763e91c5..767ddab82 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -90,13 +90,14 @@ class password extends rcube_plugin
     $rcmail->output->add_label('password');
     $this->register_action('plugin.password', array($this, 'password_init'));
     $this->register_action('plugin.password-save', array($this, 'password_save'));
-    $this->register_handler('plugin.body', array($this, 'password_form'));
     $this->include_script('password.js');
   }
 
   function password_init()
   {
     $this->add_texts('localization/');
+    $this->register_handler('plugin.body', array($this, 'password_form'));
+
     $rcmail = rcmail::get_instance();
     $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
     $rcmail->output->send('plugin');
@@ -107,9 +108,11 @@ class password extends rcube_plugin
     $rcmail = rcmail::get_instance();
 
     $this->add_texts('localization/');
-    $confirm = $rcmail->config->get('password_confirm_current');
+    $this->register_handler('plugin.body', array($this, 'password_form'));
     $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
 
+    $confirm = $rcmail->config->get('password_confirm_current');
+
     if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd']))
       $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
     else {
-- 
cgit v1.2.3