diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 16:33:13 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 16:33:13 +0200 |
| commit | 8b7c2c3c6516fd4eb606054ca3822d8a7f977282 (patch) | |
| tree | b105d7c63d0db402f59280900b110f7919707d39 /phpBB/includes/style | |
| parent | c83f386c923fdb0e2823e7f742561a44a6f0f6ed (diff) | |
| download | forums-8b7c2c3c6516fd4eb606054ca3822d8a7f977282.tar forums-8b7c2c3c6516fd4eb606054ca3822d8a7f977282.tar.gz forums-8b7c2c3c6516fd4eb606054ca3822d8a7f977282.tar.bz2 forums-8b7c2c3c6516fd4eb606054ca3822d8a7f977282.tar.xz forums-8b7c2c3c6516fd4eb606054ca3822d8a7f977282.zip | |
[feature/merging-style-components] Renaming style locator
Renaming style locator to style resource locator
PHPBB3-10632
Diffstat (limited to 'phpBB/includes/style')
| -rw-r--r-- | phpBB/includes/style/resource_locator.php (renamed from phpBB/includes/style/locator.php) | 2 | ||||
| -rw-r--r-- | phpBB/includes/style/style.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/style/template.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/style/locator.php b/phpBB/includes/style/resource_locator.php index 2d0bcce924..f36768fcd3 100644 --- a/phpBB/includes/style/locator.php +++ b/phpBB/includes/style/resource_locator.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -class phpbb_style_locator +class phpbb_style_resource_locator { /** * Paths to directories that templates are stored in. diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 217a70e237..b134b4f76f 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -78,7 +78,7 @@ class phpbb_style $this->phpEx = $phpEx; $this->config = $config; $this->user = $user; - $this->locator = new phpbb_style_locator(); + $this->locator = new phpbb_style_resource_locator(); $this->provider = new phpbb_style_path_provider(); if ($phpbb_extension_manager !== false) { diff --git a/phpBB/includes/style/template.php b/phpBB/includes/style/template.php index 02fa0bd250..076b9e05ea 100644 --- a/phpBB/includes/style/template.php +++ b/phpBB/includes/style/template.php @@ -64,7 +64,7 @@ class phpbb_style_template /** * Template locator - * @var phpbb_style_locator + * @var phpbb_style_resource_locator */ private $locator; @@ -79,10 +79,10 @@ class phpbb_style_template * * @param string $phpbb_root_path phpBB root path * @param user $user current user - * @param phpbb_style_locator $locator template locator + * @param phpbb_style_resource_locator $locator template locator * @param phpbb_style_path_provider $provider template path provider */ - public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_locator $locator, phpbb_style_path_provider_interface $provider) + public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider) { $this->phpbb_root_path = $phpbb_root_path; $this->phpEx = $phpEx; |