phpBB

Code Changes

File: includes/functions_messenger.php

  Unmodified   Added   Modified   Removed
Line 230Line 230
			// $this->template->set_filenames will do a trigger_error
$template_lang = basename($config['default_lang']);
}

			// $this->template->set_filenames will do a trigger_error
$template_lang = basename($config['default_lang']);
}

 

$ext_template_paths = array(
array(
'name' => $template_lang . '_email',
'ext_path' => 'language/' . $template_lang . '/email' . $template_dir_prefix,
),
);


if ($template_path)
{


if ($template_path)
{

Line 245Line 252
			$template_paths = array(
$template_path . $template_dir_prefix,
);

			$template_paths = array(
$template_path . $template_dir_prefix,
);

 

$board_language = basename($config['default_lang']);


// we can only specify default language fallback when the path is not a custom one for which we
// do not know the default language alternative


// we can only specify default language fallback when the path is not a custom one for which we
// do not know the default language alternative

			if ($template_lang !== basename($config['default_lang']))

			if ($template_lang !== $board_language)

			{
$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';

			{
$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';

				$fallback_template_path .= basename($config['default_lang']) . '/email';

				$fallback_template_path .= $board_language . '/email';


$template_paths[] = $fallback_template_path . $template_dir_prefix;


$template_paths[] = $fallback_template_path . $template_dir_prefix;

 

$ext_template_paths[] = array(
'name' => $board_language . '_email',
'ext_path' => 'language/' . $board_language . '/email' . $template_dir_prefix,
);
}
// If everything fails just fall back to en template
if ($template_lang !== 'en' && $board_language !== 'en')
{
$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
$fallback_template_path .= 'en/email';

$template_paths[] = $fallback_template_path . $template_dir_prefix;

$ext_template_paths[] = array(
'name' => 'en_email',
'ext_path' => 'language/en/email' . $template_dir_prefix,
);

			}
}


			}
}


		$this->set_template_paths(array(
array(
'name' => $template_lang . '_email',
'ext_path' => 'language/' . $template_lang . '/email' . $template_dir_prefix,
),
), $template_paths);

		$this->set_template_paths($ext_template_paths, $template_paths);







$this->template->set_filenames(array(
'body' => $template_file . '.txt',


$this->template->set_filenames(array(
'body' => $template_file . '.txt',