mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

Browse Source
This commit is contained in:
Yuriy Rusko
2014-05-28 01:02:39 +02:00
parent 1d61bcedfd 08c01b7cee
commit 2a42aee8ac
10 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions_messenger.php
View File

@@ -255,7 +255,12 @@ class messenger
}
}
$this->set_template_paths($template_lang . '_email', $template_paths);
$this->set_template_paths(array(
array(
'name' => $template_lang . '_email',
'ext_path' => 'language/' . $template_lang . '/email'
),
), $template_paths);
$this->template->set_filenames(array(
'body' => $template_file . '.txt',

7
phpBB/includes/functions_module.php
View File

@@ -584,7 +584,12 @@ class p_master
if (is_dir($module_style_dir))
{
$template->set_custom_style('adm', array($module_style_dir, $phpbb_admin_path . 'style'));
$template->set_custom_style(array(
array(
'name' => 'adm',
'ext_path' => 'adm/style/',
),
), array($module_style_dir, $phpbb_admin_path . 'style'));
}
}