makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/template-engine] Delete template class, use phpbb_template instead.

Browse source 
PHPBB3-9726
This commit is contained in:
Oleg Pudeyev 2011-05-01 04:03:06 -04:00
parent 48691b53a6
commit 87832d06cc
5 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/common.php
View file

@ -209,7 +209,7 @@ $class_loader->set_cache($cache->get_driver());
$request = new phpbb_request(); $request = new phpbb_request();
$user = new user(); $user = new user();
$auth = new auth(); $auth = new auth();
$template = new template(); $template = new phpbb_template();
$db = new $sql_db(); $db = new $sql_db();
// make sure request_var uses this request instance // make sure request_var uses this request instance

2
phpBB/includes/functions_messenger.php
View file

@ -193,7 +193,7 @@ class messenger
// tpl_msg now holds a template object we can use to parse the template file // tpl_msg now holds a template object we can use to parse the template file
if (!isset($this->tpl_msg[$template_lang . $template_file])) if (!isset($this->tpl_msg[$template_lang . $template_file]))
{ {
$this->tpl_msg[$template_lang . $template_file] = new template(); $this->tpl_msg[$template_lang . $template_file] = new phpbb_template();
$tpl = &$this->tpl_msg[$template_lang . $template_file]; $tpl = &$this->tpl_msg[$template_lang . $template_file];
$fallback_template_path = false; $fallback_template_path = false;

9
phpBB/includes/template.php
View file

@ -866,12 +866,3 @@ class phpbb_template
include($file); include($file);
} }
} }
/**
* @todo remove this
*
*/
class template extends phpbb_template
{
// dirty hack
}

2
phpBB/install/index.php
View file

@ -262,7 +262,7 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle
$user = new user(); $user = new user();
$auth = new auth(); $auth = new auth();
$template = new template(); $template = new phpbb_template();
// Add own hook handler, if present. :o // Add own hook handler, if present. :o
if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx))

2
tests/template/template_test.php
View file

@ -33,7 +33,7 @@ class phpbb_template_template_test extends phpbb_test_case
private function setup_engine() private function setup_engine()
{ {
$this->template_path = dirname(__FILE__) . '/templates'; $this->template_path = dirname(__FILE__) . '/templates';
$this->template = new template(); $this->template = new phpbb_template();
$this->template->set_custom_template($this->template_path, 'tests'); $this->template->set_custom_template($this->template_path, 'tests');
} }