mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

document plugin-support

Browse Source 
move language path declaration to object instantiation


git-svn-id: file:///svn/phpbb/trunk@9239 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-12-28 10:53:28 +00:00
parent 0c1c26e2ee
commit fbaf2baa8d
6 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/includes/classes/user.php
View File

@@ -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, ...)
*