From: withoutaname <drevitchi@gmail.com>
Date: Tue, 29 Jul 2014 09:07:50 +0000 (-0700)
Subject: Move PasswordError under includes/password/ file
X-Git-Tag: 1.31.0-rc.0~14700^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=72462041c030caa32a71f579d1e1d8c165da01de;p=lhc%2Fweb%2Fwiklou.git

Move PasswordError under includes/password/ file

Change-Id: I7256325492b2f6451223714efb8b3e07fca9ee3e
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 905050d7ef..9fa0c13784 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -130,7 +130,6 @@ $wgAutoloadLocalClasses = array(
 	'MWNamespace' => 'includes/MWNamespace.php',
 	'OutputPage' => 'includes/OutputPage.php',
 	'Pager' => 'includes/Pager.php',
-	'PasswordError' => 'includes/User.php',
 	'PathRouter' => 'includes/PathRouter.php',
 	'PathRouterPatternReplacer' => 'includes/PathRouter.php',
 	'PhpHttpRequest' => 'includes/HttpFunctions.php',
@@ -836,6 +835,7 @@ $wgAutoloadLocalClasses = array(
 	'MWOldPassword' => 'includes/password/MWOldPassword.php',
 	'ParameterizedPassword' => 'includes/password/ParameterizedPassword.php',
 	'Password' => 'includes/password/Password.php',
+	'PasswordError' => 'includes/password/PasswordError.php',
 	'PasswordFactory' => 'includes/password/PasswordFactory.php',
 	'Pbkdf2Password' => 'includes/password/Pbkdf2Password.php',
 	'EncryptedPassword' => 'includes/password/EncryptedPassword.php',
diff --git a/includes/User.php b/includes/User.php
index 73d4959ee5..a887e36202 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -38,14 +38,6 @@ define( 'MW_USER_VERSION', 10 );
  */
 define( 'EDIT_TOKEN_SUFFIX', '+\\' );
 
-/**
- * Thrown by User::setPassword() on error.
- * @ingroup Exception
- */
-class PasswordError extends MWException {
-	// NOP
-}
-
 /**
  * The User object encapsulates all of the user-specific settings (user_id,
  * name, rights, password, email address, options, last login time). Client
diff --git a/includes/password/PasswordError.php b/includes/password/PasswordError.php
new file mode 100644
index 0000000000..c9707adb03
--- /dev/null
+++ b/includes/password/PasswordError.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Show an error when any operation involving passwords fails to run.
+ *
+ * @ingroup Exception
+ */
+class PasswordError extends MWException {
+	// NOP
+}