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

[ticket/11768] Renamed property

Browse source 
PHPBB3-11768
This commit is contained in:
JoshyPHP 2015-03-03 00:59:44 +01:00
parent 458cf95b1e
commit 70b7e57497
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/phpbb/textformatter/s9e/factory.php
View file

@ -57,7 +57,7 @@ class factory implements \phpbb\textformatter\cache
/**
* @var \phpbb\textformatter\data_access
*/
protected $dal;
protected $data_access;
/**
* @var array Default BBCode definitions
@ -102,21 +102,21 @@ class factory implements \phpbb\textformatter\cache
/**
* Constructor
*
* @param \phpbb\textformatter\data_access $dal
* @param \phpbb\textformatter\data_access $data_access
* @param \phpbb\cache\driver\driver_interface $cache
* @param string $cache_dir Path to the cache dir
* @param string $cache_key_parser Cache key used for the parser
* @param string $cache_key_renderer Cache key used for the renderer
* @return null
*/
public function __construct(\phpbb\textformatter\data_access $dal, \phpbb\cache\driver\driver_interface $cache, $cache_dir, $cache_key_parser, $cache_key_renderer)
public function __construct(\phpbb\textformatter\data_access $data_access, \phpbb\cache\driver\driver_interface $cache, $cache_dir, $cache_key_parser, $cache_key_renderer)
{
$this->cache = $cache;
$this->cache_dir = $cache_dir;
$this->cache_key_parser = $cache_key_parser;
$this->cache_key_renderer = $cache_key_renderer;
$this->dal = $dal;
$this->data_access = $data_access;
}
/**
@ -222,7 +222,7 @@ class factory implements \phpbb\textformatter\cache
}
// Load custom BBCodes
foreach ($this->dal->get_bbcodes() as $row)
foreach ($this->data_access->get_bbcodes() as $row)
{
// Insert the board's URL before {LOCAL_URL} tokens
$tpl = preg_replace_callback(
@ -247,7 +247,7 @@ class factory implements \phpbb\textformatter\cache
}
// Load smilies
foreach ($this->dal->get_smilies() as $row)
foreach ($this->data_access->get_smilies() as $row)
{
$configurator->Emoticons->add(
$row['code'],
@ -266,7 +266,7 @@ class factory implements \phpbb\textformatter\cache
}
// Load the censored words
$censor = $this->dal->get_censored_words();
$censor = $this->data_access->get_censored_words();
if (!empty($censor))
{
// Use a namespaced tag to avoid collisions
@ -339,7 +339,7 @@ class factory implements \phpbb\textformatter\cache
{
// For each BBCode, build an associative array matching style_ids to their template
$templates = array();
foreach ($this->dal->get_styles_templates() as $style_id => $data)
foreach ($this->data_access->get_styles_templates() as $style_id => $data)
{
foreach ($this->extract_templates($data['template']) as $bbcode_name => $template)
{