From fbaf2baa8d683a2afdd3cf98ea1e7c035369f1a3 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 28 Dec 2008 10:53:28 +0000
Subject: document plugin-support move language path declaration to object
 instantiation

git-svn-id: file:///svn/phpbb/trunk@9239 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/classes/user.php | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'phpBB/includes/classes/user.php')

diff --git a/phpBB/includes/classes/user.php b/phpBB/includes/classes/user.php
index af425f2299..85a2ee012f 100644
--- a/phpBB/includes/classes/user.php
+++ b/phpBB/includes/classes/user.php
@@ -106,10 +106,10 @@ class phpbb_user extends phpbb_session
 	* Constructor to set the lang path. Calls parrent::__construct()
 	*
 	* @param string	$auth_method		The authentication method to use, for example 'db'
-	* @param string	$custom_lang_path	An optional language pack path.
+	* @param string	$lang_path			Language pack path
 	* @access public
 	*/
-	public function __construct($auth_method, $custom_lang_path = false)
+	public function __construct($auth_method, $lang_path)
 	{
 		parent::__construct();
 
@@ -123,7 +123,13 @@ class phpbb_user extends phpbb_session
 		}
 
 		// Set language path
-		$this->lang_path = ($custom_lang_path === false) ? PHPBB_ROOT_PATH . 'language/' : $this->set_custom_lang_path($custom_lang_path);
+		$this->lang_path = $lang_path;
+
+		// Make sure last character is a directory separator
+		if (substr($this->lang_path, -1) != DIRECTORY_SEPARATOR)
+		{
+			$this->lang_path .= DIRECTORY_SEPARATOR;
+		}
 	}
 
 	/**
@@ -139,22 +145,6 @@ class phpbb_user extends phpbb_session
 		phpbb::$acl->init($this->data);
 	}
 
-	/**
-	* Function to set custom language path (able to use directory outside of phpBB)
-	*
-	* @param string	$lang_path	New language path used.
-	* @access public
-	*/
-	public function set_custom_lang_path($lang_path)
-	{
-		$this->lang_path = $lang_path;
-
-		if (substr($this->lang_path, -1) != '/')
-		{
-			$this->lang_path .= '/';
-		}
-	}
-
 	/**
 	* Setup basic user-specific items (style, language, ...)
 	*
-- 
cgit v1.2.1