From 300d5c32db82a72309d389860864e5513ca45ce4 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 13 May 2014 23:22:54 +0200 Subject: [ticket/12509] Add an option to set the path of custom file for extensions https://tracker.phpbb.com/browse/PHPBB3-12509 PHPBB3-12509 --- phpBB/includes/functions_messenger.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 79a5aeda1a..bc5937fdc4 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -252,7 +252,10 @@ class messenger } } - $this->set_template_paths($template_lang . '_email', $template_paths); + $this->set_template_paths(array( + 'name' => $template_lang . '_email', + 'ext_path' => 'language/' . $template_lang . '/email' + ), $template_paths); $this->template->set_filenames(array( 'body' => $template_file . '.txt', -- cgit v1.2.1 From 1e427fa031eea8dd6a1e04f1407f996d1d948203 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 13 May 2014 23:39:42 +0200 Subject: [ticket/12509] Fix the call to set_custom_file in adm/index and messenger PHPBB3-12509 --- phpBB/includes/functions_messenger.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index bc5937fdc4..482f95dd99 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -253,8 +253,10 @@ class messenger } $this->set_template_paths(array( - 'name' => $template_lang . '_email', - 'ext_path' => 'language/' . $template_lang . '/email' + array( + 'name' => $template_lang . '_email', + 'ext_path' => 'language/' . $template_lang . '/email' + ) ), $template_paths); $this->template->set_filenames(array( -- cgit v1.2.1 From 9d7c36041e0dac509476069ee5bbce92e841f33e Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 14 May 2014 02:16:32 +0200 Subject: [ticket/12509] Update calls to set_custom_style in forgotten places PHPBB3-12509 --- phpBB/includes/functions_module.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 04efcb7b2e..9ef0754120 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')); } } -- cgit v1.2.1 From 9a846e447ba98b175c510d9fbe7741648296a1ba Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 26 May 2014 23:44:30 +0200 Subject: [ticket/12509] Add missing ',' in arrays PHPBB3-12509 --- phpBB/includes/functions_messenger.php | 2 +- phpBB/includes/functions_module.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 482f95dd99..4a3f2ec73a 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -256,7 +256,7 @@ class messenger array( 'name' => $template_lang . '_email', 'ext_path' => 'language/' . $template_lang . '/email' - ) + ), ), $template_paths); $this->template->set_filenames(array( diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 9ef0754120..86d3a3a077 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -585,7 +585,7 @@ class p_master array( 'name' => 'adm', 'ext_path' => 'adm/style/', - ) + ), ), array($module_style_dir, $phpbb_admin_path . 'style')); } } -- cgit v1.2.1