Withoutaname has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150168
Change subject: Move PasswordError under includes/password/ file
......................................................................
Move PasswordError under includes/password/ file
Change-Id: I7256325492b2f6451223714efb8b3e07fca9ee3e
---
M includes/AutoLoader.php
M includes/User.php
A includes/password/PasswordError.php
3 files changed, 29 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/150168/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 905050d..9fa0c13 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -130,7 +130,6 @@
'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 @@
'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 73d4959..a887e36 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -39,14 +39,6 @@
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
* classes use the getXXX() functions to access these fields. These functions
diff --git a/includes/password/PasswordError.php
b/includes/password/PasswordError.php
new file mode 100644
index 0000000..c9707ad
--- /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
+}
--
To view, visit https://gerrit.wikimedia.org/r/150168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7256325492b2f6451223714efb8b3e07fca9ee3e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname <drevit...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
