diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-01 04:03:06 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-04 00:08:20 -0400 |
| commit | 87832d06cca520e27c5dbed1c36ab9c12240ae3d (patch) | |
| tree | e2311f99e5f02fd78a5e19e4b020f4973b039ab0 /phpBB | |
| parent | 48691b53a6b3397ede4f009e8a108b14b7f7f305 (diff) | |
| download | forums-87832d06cca520e27c5dbed1c36ab9c12240ae3d.tar forums-87832d06cca520e27c5dbed1c36ab9c12240ae3d.tar.gz forums-87832d06cca520e27c5dbed1c36ab9c12240ae3d.tar.bz2 forums-87832d06cca520e27c5dbed1c36ab9c12240ae3d.tar.xz forums-87832d06cca520e27c5dbed1c36ab9c12240ae3d.zip | |
[feature/template-engine] Delete template class, use phpbb_template instead.
PHPBB3-9726
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/common.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/template.php | 9 | ||||
| -rw-r--r-- | phpBB/install/index.php | 2 |
4 files changed, 3 insertions, 12 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index ccd043ba70..a6ae7dff75 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -209,7 +209,7 @@ $class_loader->set_cache($cache->get_driver()); $request = new phpbb_request(); $user = new user(); $auth = new auth(); -$template = new template(); +$template = new phpbb_template(); $db = new $sql_db(); // make sure request_var uses this request instance diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index f5d102b1da..8255d4b148 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -193,7 +193,7 @@ class messenger // tpl_msg now holds a template object we can use to parse the 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]; $fallback_template_path = false; diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index dc461fb60e..2a32af406c 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -866,12 +866,3 @@ class phpbb_template include($file); } } - -/** - * @todo remove this - * - */ -class template extends phpbb_template -{ - // dirty hack -} diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 3cbc8744dd..6618e42ae8 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -262,7 +262,7 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle $user = new user(); $auth = new auth(); -$template = new template(); +$template = new phpbb_template(); // Add own hook handler, if present. :o if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) |