- remove _confirm function

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

1 files changed, 2 insertions, 8 deletions

diff --git a/roundcubemail/plugins/password/password.php b/roundcubemail/plugins/password/password.php
index 1ff755bfd..f10c43ca9 100644
--- a/roundcubemail/plugins/password/password.php
+++ b/roundcubemail/plugins/password/password.php
@@ -104,7 +104,7 @@ class password extends rcube_plugin
   {
     $rcmail = rcmail::get_instance();
 
-    $confirm = $this->_confirm($rcmail->config);
+    $confirm = $rcmail->config->get('password_confirm_current');
     $this->add_texts('localization/');
 
     if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd']))
@@ -130,7 +130,7 @@ class password extends rcube_plugin
   {
     $rcmail = rcmail::get_instance();
 
-    $confirm = $this->_confirm($rcmail->config);
+    $confirm = $rcmail->config->get('password_confirm_current');
     // add some labels to client
     $rcmail->output->add_label(
 	'password.nopassword',
@@ -201,12 +201,6 @@ class password extends rcube_plugin
 	), $out);
   }
 
-  private function _confirm($cfg) {
-    $val = $cfg->get('password_confirm_current');
-    //return empty($val) || $val;
-    return $val;
-  }
-
   private function _save($curpass,$passwd)
   {
     $cfg = rcmail::get_instance()->config;