From 5d1afb453211d42a8deacb66684c136385918192 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 12:24:35 -0500
Subject: [ticket/11628] Remove phpbb_style (move methods to phpbb_template)
PHPBB3-11628
---
phpBB/adm/index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/adm/index.php')
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 8cd1967c75..3f29072899 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,7 +50,7 @@ $module_id = request_var('i', '');
$mode = request_var('mode', '');
// Set custom style for admin area
-$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
+$template->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
--
cgit v1.2.1
From 4b761f65758c40db4851983fa3a08d354da3323d Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 12:55:41 -0500
Subject: [ticket/11628] Remove third parameter ($names) from set_custom_style
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument
PHPBB3-11628
---
phpBB/adm/index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/adm/index.php')
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 3f29072899..c79327d22c 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,7 +50,7 @@ $module_id = request_var('i', '');
$mode = request_var('mode', '');
// Set custom style for admin area
-$template->set_custom_style('admin', $phpbb_admin_path . 'style', array(), '');
+$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
--
cgit v1.2.1
From 12c22585069066957cc3211136ebd480295d4758 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Wed, 24 Jul 2013 13:25:20 -0500
Subject: [ticket/11628] Remove template_path option on set_custom_style
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)
PHPBB3-11628
---
phpBB/adm/index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/adm/index.php')
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index c79327d22c..3520eb8b70 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,7 +50,7 @@ $module_id = request_var('i', '');
$mode = request_var('mode', '');
// Set custom style for admin area
-$template->set_custom_style('admin', $phpbb_admin_path . 'style', '');
+$template->set_custom_style('admin', $phpbb_admin_path . 'style');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
--
cgit v1.2.1
From 8ee86b75908141c28aa4d92ba93921337cde30c3 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Wed, 28 Aug 2013 13:40:35 -0500
Subject: [ticket/11791] Load adm/ events from styles/adm/event/
PHPBB3-11791
---
phpBB/adm/index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'phpBB/adm/index.php')
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 3520eb8b70..c1e8edbd03 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,7 +50,7 @@ $module_id = request_var('i', '');
$mode = request_var('mode', '');
// Set custom style for admin area
-$template->set_custom_style('admin', $phpbb_admin_path . 'style');
+$template->set_custom_style('adm', $phpbb_admin_path . 'style');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
--
cgit v1.2.1