From f5eb0d744e46a2931aa667dbc7a8a4d9ea0229e6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 22 Sep 2013 21:17:30 +0200
Subject: [feature/passwords] Use dependency injection for helper

This will now be used instead of manually loading the passwords helper
instance in the passwords manager.

PHPBB3-11610
---
 phpBB/phpbb/passwords/helper.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/passwords/helper.php')

diff --git a/phpBB/phpbb/passwords/helper.php b/phpBB/phpbb/passwords/helper.php
index d91edb90a1..0ce1d3be45 100644
--- a/phpBB/phpbb/passwords/helper.php
+++ b/phpBB/phpbb/passwords/helper.php
@@ -26,13 +26,16 @@ class phpbb_passwords_helper
 	protected $manager;
 
 	/**
-	* Construct a phpbb_passwords_helper object
+	* Set the passwords manager instance
 	*
 	* @param phpbb_passwords_manager $manager Crypto manager object
 	*/
-	public function __construct($manager)
+	public function set_manager(phpbb_passwords_manager $manager)
 	{
-		$this->manager = $manager;
+		if ($this->manager === null)
+		{
+			$this->manager = $manager;
+		}
 	}
 
 	/**
-- 
cgit v1.2.1