diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:23:37 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:23:37 +0200 |
| commit | 08c01b7cee629701dc62b32b03eb5543e8c9d196 (patch) | |
| tree | c5c5627c54d7a930e1cec89ea2b8a973b1b79ebf /phpBB/includes | |
| parent | 83fc8725daf163398300ff6ddc6256b9444b39cd (diff) | |
| parent | 05cd25a88b551d7338596cc6634e95cb371f565d (diff) | |
| download | forums-08c01b7cee629701dc62b32b03eb5543e8c9d196.tar forums-08c01b7cee629701dc62b32b03eb5543e8c9d196.tar.gz forums-08c01b7cee629701dc62b32b03eb5543e8c9d196.tar.bz2 forums-08c01b7cee629701dc62b32b03eb5543e8c9d196.tar.xz forums-08c01b7cee629701dc62b32b03eb5543e8c9d196.zip | |
Merge pull request #2455 from Nicofuma/ticket/12509
[ticket/12509] Add an option to set the path of custom style directory (ie: email templates) for extensions
* Nicofuma/ticket/12509:
[ticket/12509] Add example in doc block
[ticket/12509] Add missing ',' in arrays
[ticket/12509] Update calls to set_custom_style in forgotten places
[ticket/12509] Fix path in adm/index.php
[ticket/12509] Fix typo in adm/index.php
[ticket/12509] Fix doc block
[ticket/12509] Fix the call to set_custom_file in adm/index and messenger
[ticket/12509] Update acp custom_style setter
[ticket/12509] Add an option to set the path of custom file for extensions
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/functions_module.php | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 79a5aeda1a..4a3f2ec73a 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -252,7 +252,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', diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 04efcb7b2e..86d3a3a077 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -581,7 +581,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')); } } |