mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-p/feature/template-engine' into develop

Browse Source 
* github-p/feature/template-engine: (87 commits)
  [feature/template-engine] Delete _get_locator function.
  [feature/template-engine] Clean up template locator usage in bbcode.
  [feature/template-engine] Need to call set_template on template.
  [feature/template-engine] Update installer for template engine changes.
  [feature/template-engine] Dependency inject locator into template.
  [feature/template-engine] Delete useless code from set_template.
  [feature/template-engine] Delete no longer used $template_filename property.
  [feature/template-engine] Delete useless $template globalization.
  [feature/template-engine] Use template engine class in bbcode class.
  [feature/template-engine] Corrected an error message in template locator.
  [feature/template-engine] Remaining documentation.
  [feature/template-engine] More documentation for template class.
  [feature/template-engine] Create load_and_render to reduce code duplication.
  [feature/template-engine] Get rid of orig_tpl_* in template engine.
  [feature/template-engine] Delete $style_name param from locator's set_custom_template.
  [feature/template-engine] Add constructor to template locator.
  [feature/template-engine] Factor template locator out of template class.
  [feature/template-engine] Delete $files_template property.
  [feature/template-engine] Rename is_absolute to phpbb_is_absolute.
  [feature/template-engine] Test template DEFINE statements across files
  ...

Conflicts:
	.gitignore
	phpBB/includes/template.php
This commit is contained in:
Nils Adermann
2011-08-13 23:59:15 -04:00
parent 4754e11d67 41de09e408
commit 6fa83ba876
43 changed files with 2771 additions and 1712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/includes/bbcode.php
View File

@@ -30,7 +30,6 @@ class bbcode
var $bbcodes = array();
var $template_bitfield;
var $template_filename = '';
/**
* Constructor
@@ -128,28 +127,17 @@ class bbcode
*/
function bbcode_cache_init()
{
global $phpbb_root_path, $template, $user;
global $phpbb_root_path, $phpEx, $config, $user;
if (empty($this->template_filename))
{
$this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']);
$this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html';
if (!@file_exists($this->template_filename))
{
if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
{
$this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template/bbcode.html';
if (!@file_exists($this->template_filename))
{
trigger_error('The file ' . $this->template_filename . ' is missing.', E_USER_ERROR);
}
}
else
{
trigger_error('The file ' . $this->template_filename . ' is missing.', E_USER_ERROR);
}
}
$template_locator = new phpbb_template_locator();
$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
$template->set_template();
$template_locator->set_filenames(array('bbcode.html' => 'bbcode.html'));
$this->template_filename = $template_locator->get_source_file_for_handle('bbcode.html');
}
$bbcode_ids = $rowset = $sql = array();