This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 79478e91ef7b1e8439049a9c2a8e6ff7af69fb50 (commit)
from a2fb275cec74ec1eca4d890870dfb196a22019ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=79478e91ef7b1e8439049a9c2a8e6ff7af69fb50
commit 79478e91ef7b1e8439049a9c2a8e6ff7af69fb50
Author: Franck Villaume <[email protected]>
Date: Sun Apr 8 10:38:43 2018 +0200
fix Merge 6.1
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index 846e59b..79474ac 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -1436,18 +1436,6 @@ class FFUser extends FFError {
}
/**
-<<<<<<< HEAD
- * setMD5Passwd - Changes user's MD5 password.
- *
- * @param string $md5 The MD5-hashed password.
- */
- function setMD5Passwd($md5) {
- exit(_('Error')._(': ')._('Could not change password')._(':
')._('MD5 obsoleted'));
- }
-
- /**
-=======
->>>>>>> 6.1
* setUnixPasswd - Changes user's Unix-hashed password.
*
* @param string $unix The Unix-hashed password.
@@ -1462,11 +1450,7 @@ class FFUser extends FFError {
array($unix, $this->getID()));
if (!$res || db_affected_rows($res) < 1) {
-<<<<<<< HEAD
$this->setError(_('Error')._(': ')._('Could not
change password')._(': ').db_error());
-=======
- $this->setError(_('Error')._(': ')._('Cannot
Change User Password')._(': ').db_error());
->>>>>>> 6.1
db_rollback();
return false;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/User.class.php | 16 ----------------
1 file changed, 16 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
