diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-21 00:32:20 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-21 00:32:20 +0200 |
| commit | cc1a96a8045b6abe5b1234afb045912d53669fee (patch) | |
| tree | 3ee3237344ba2ddf649222236d4ca89b6ee650f9 /phpBB/phpbb/passwords | |
| parent | 5b3829aab45d4eb53207c1153fc7c71c72f0f83c (diff) | |
| parent | fa44e98e72d7b0f8cdb6ca9f9d65127a1a368d05 (diff) | |
| download | forums-cc1a96a8045b6abe5b1234afb045912d53669fee.tar forums-cc1a96a8045b6abe5b1234afb045912d53669fee.tar.gz forums-cc1a96a8045b6abe5b1234afb045912d53669fee.tar.bz2 forums-cc1a96a8045b6abe5b1234afb045912d53669fee.tar.xz forums-cc1a96a8045b6abe5b1234afb045912d53669fee.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13976] Fix comment typo in salted_md5.php
Diffstat (limited to 'phpBB/phpbb/passwords')
| -rw-r--r-- | phpBB/phpbb/passwords/driver/salted_md5.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php index 81ac010785..38d6d9cd2c 100644 --- a/phpBB/phpbb/passwords/driver/salted_md5.php +++ b/phpBB/phpbb/passwords/driver/salted_md5.php @@ -75,7 +75,7 @@ class salted_md5 extends base // happen if pre-determined settings are // directly passed to the driver. The manager // will not do this. Same as the old hashing - // implementatio in phpBB 3.0 + // implementation in phpBB 3.0 return md5($password); } } |