1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 23:11:45 +02:00

Make sure that the language does get passed between all modules

git-svn-id: file:///svn/phpbb/trunk@6201 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames
2006-07-23 17:43:48 +00:00
parent 4cf863dcb3
commit ba5d555669
3 changed files with 14 additions and 10 deletions

View File

@@ -412,7 +412,7 @@ class module
*/
function generate_navigation()
{
global $lang, $template, $phpEx;
global $lang, $template, $phpEx, $language;
if (is_array($this->module_ary))
{
@@ -422,7 +422,7 @@ class module
$cat = $cat_ary['name'];
$l_cat = (!empty($lang['CAT_' . $cat])) ? $lang['CAT_' . $cat] : preg_replace('#_#', ' ', $cat);
$cat = strtolower($cat);
$url = $this->module_url . '?mode=' . $cat;
$url = $this->module_url . "?mode=$cat&language=$language";
if ($this->mode == $cat)
{
@@ -439,7 +439,7 @@ class module
{
$l_option = (!empty($lang['SUB_' . $option])) ? $lang['SUB_' . $option] : preg_replace('#_#', ' ', $option);
$option = strtolower($option);
$url = $this->module_url . '?mode=' . $this->mode . '&sub=' . $option;
$url = $this->module_url . '?mode=' . $this->mode . "&sub=&language=$language";
$template->assign_block_vars('l_block1', array(
'L_TITLE' => $l_option,