Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/plugins/AuthenticationPlugin.class.php3
-rw-r--r--libraries/plugins/auth/AuthenticationCookie.class.php3
-rw-r--r--libraries/plugins/auth/AuthenticationHttp.class.php3
-rw-r--r--user_password.php2
4 files changed, 4 insertions, 7 deletions
diff --git a/libraries/plugins/AuthenticationPlugin.class.php b/libraries/plugins/AuthenticationPlugin.class.php
index 457de4ca71..e9a6ee1052 100644
--- a/libraries/plugins/AuthenticationPlugin.class.php
+++ b/libraries/plugins/AuthenticationPlugin.class.php
@@ -91,11 +91,10 @@ abstract class AuthenticationPlugin
*
* @param string $password New password to set
*
- * @return array Additional URL parameters.
+ * @return void
*/
public function handlePasswordChange($password)
{
- return array();
}
}
?>
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index a0d699bfd7..fc5983c4d5 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -844,11 +844,10 @@ class AuthenticationCookie extends AuthenticationPlugin
*
* @param string $password New password to set
*
- * @return array Additional URL parameters.
+ * @return void
*/
public function handlePasswordChange($password)
{
$this->storePasswordCookie($password);
- return array();
}
}
diff --git a/libraries/plugins/auth/AuthenticationHttp.class.php b/libraries/plugins/auth/AuthenticationHttp.class.php
index 2b2fe7e0cd..df4f71f8be 100644
--- a/libraries/plugins/auth/AuthenticationHttp.class.php
+++ b/libraries/plugins/auth/AuthenticationHttp.class.php
@@ -271,10 +271,9 @@ class AuthenticationHttp extends AuthenticationPlugin
*
* @param string $password New password to set
*
- * @return array Additional URL parameters.
+ * @return void
*/
public function handlePasswordChange($password)
{
- return array('old_usr' => 'relog');
}
}
diff --git a/user_password.php b/user_password.php
index 87a8cef26f..c9313fc500 100644
--- a/user_password.php
+++ b/user_password.php
@@ -137,7 +137,7 @@ function PMA_changePassword($password, $message, $change_password_message)
$password, $sql_query, $hashing_function
);
- $url_params = $auth_plugin->handlePasswordChange($password);
+ $auth_plugin->handlePasswordChange($password);
PMA_getChangePassMessage($change_password_message, $sql_query);
PMA_changePassDisplayPage($message, $sql_query);
}