aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-07-06 00:17:32 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-09-14 13:55:06 +0200
commit05a5ac282d1f62324ac07f91346bf9b08dc203aa (patch)
tree45516ba5893f99ef262c4c3bb3b8560dcf3158f0
parentb6473a515b4c163171d3cda471ffd348797a0d8f (diff)
downloadforums-05a5ac282d1f62324ac07f91346bf9b08dc203aa.tar
forums-05a5ac282d1f62324ac07f91346bf9b08dc203aa.tar.gz
forums-05a5ac282d1f62324ac07f91346bf9b08dc203aa.tar.bz2
forums-05a5ac282d1f62324ac07f91346bf9b08dc203aa.tar.xz
forums-05a5ac282d1f62324ac07f91346bf9b08dc203aa.zip
[feature/passwords] Fix incorrect call to helper instead of $this
The driver helper method unique_id is called inside the helper. Therefore, it shouldn't be called via $this->helper but rather via $this. PHPBB3-11610
-rw-r--r--phpBB/includes/crypto/driver/helper.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/crypto/driver/helper.php b/phpBB/includes/crypto/driver/helper.php
index 3eafdf1ecc..308ee7dce2 100644
--- a/phpBB/includes/crypto/driver/helper.php
+++ b/phpBB/includes/crypto/driver/helper.php
@@ -129,11 +129,11 @@ class phpbb_crypto_driver_helper
if (strlen($random) < $length)
{
$random = '';
- $random_state = $this->helper->unique_id();
+ $random_state = $this->unique_id();
for ($i = 0; $i < $length; $i += 16)
{
- $random_state = md5($this->helper->unique_id() . $random_state);
+ $random_state = md5($this->unique_id() . $random_state);
$random .= pack('H*', md5($random_state));
}
$random = substr($random, 0, $length);