From f7b06ca12db9da519d49ce334eaf96573d003c0f Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sat, 9 Jul 2011 23:33:44 +0200 Subject: [PATCH] [feature/template-engine] Move template.php to includes/template This allows making use of autoloading. PHPBB3-9726 --- phpBB/common.php | 1 - phpBB/includes/{ => template}/template.php | 0 phpBB/install/database_update.php | 1 - phpBB/install/index.php | 1 - tests/template/template_compile_test.php | 1 - tests/template/template_test_case.php | 1 - 6 files changed, 5 deletions(-) rename phpBB/includes/{ => template}/template.php (100%) diff --git a/phpBB/common.php b/phpBB/common.php index 46f78a7926..67fb5cf6ae 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -182,7 +182,6 @@ if (!empty($load_extensions) && function_exists('dl')) // Include files require($phpbb_root_path . 'includes/class_loader.' . $phpEx); -require($phpbb_root_path . 'includes/template.' . $phpEx); require($phpbb_root_path . 'includes/session.' . $phpEx); require($phpbb_root_path . 'includes/auth.' . $phpEx); diff --git a/phpBB/includes/template.php b/phpBB/includes/template/template.php similarity index 100% rename from phpBB/includes/template.php rename to phpBB/includes/template/template.php diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 0d3e96f342..ca7ac8aad5 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -60,7 +60,6 @@ if (!empty($load_extensions) && function_exists('dl')) // Include files require($phpbb_root_path . 'includes/class_loader.' . $phpEx); -require($phpbb_root_path . 'includes/template.' . $phpEx); require($phpbb_root_path . 'includes/session.' . $phpEx); require($phpbb_root_path . 'includes/auth.' . $phpEx); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 6618e42ae8..15f8c670a4 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -162,7 +162,6 @@ if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) include($phpbb_root_path . 'includes/auth.' . $phpEx); include($phpbb_root_path . 'includes/session.' . $phpEx); -include($phpbb_root_path . 'includes/template.' . $phpEx); include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); require($phpbb_root_path . 'includes/functions_install.' . $phpEx); diff --git a/tests/template/template_compile_test.php b/tests/template/template_compile_test.php index bfd4e03406..769c7c2680 100644 --- a/tests/template/template_compile_test.php +++ b/tests/template/template_compile_test.php @@ -8,7 +8,6 @@ */ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/template.php'; class phpbb_template_template_compile_test extends phpbb_test_case { diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index e7c12065cc..cab1aa3d4f 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -8,7 +8,6 @@ */ require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/template.php'; class phpbb_template_template_test_case extends phpbb_test_case {