mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

[ticket/13804] Make template's user dependency optional

Browse Source 
PHPBB3-13804
This commit is contained in:
MateBartus
2015-05-01 19:04:21 +02:00
parent de687f32ed
commit 7b301e22f3
14 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/phpbb/template/exception/user_object_not_available.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\template\exception;
/**
* This exception is thrown when the user object was not set but it is required by the called method
*/
class user_object_not_available extends \phpbb\exception\runtime_exception
{
}

24
phpBB/phpbb/template/twig/twig.php
View File

@@ -13,6 +13,8 @@
namespace phpbb\template\twig;
use phpbb\template\exception\user_object_not_available;
/**
* Twig Template class.
*/
@@ -76,14 +78,14 @@ class twig extends \phpbb\template\base
*
* @param \phpbb\path_helper $path_helper
* @param \phpbb\config\config $config
* @param \phpbb\user $user
* @param \phpbb\template\context $context template context
* @param \phpbb\template\twig\environment $twig_environment
* @param string $cache_path
* @param \phpbb\user|null $user
* @param array|\ArrayAccess $extensions
* @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked
*/
public function __construct(\phpbb\path_helper $path_helper, $config, $user, \phpbb\template\context $context, \phpbb\template\twig\environment $twig_environment, $cache_path, $extensions = array(), \phpbb\extension\manager $extension_manager = null)
public function __construct(\phpbb\path_helper $path_helper, $config, \phpbb\template\context $context, \phpbb\template\twig\environment $twig_environment, $cache_path, \phpbb\user $user = null, $extensions = array(), \phpbb\extension\manager $extension_manager = null)
{
$this->path_helper = $path_helper;
$this->phpbb_root_path = $path_helper->get_phpbb_root_path();
@@ -126,9 +128,16 @@ class twig extends \phpbb\template\base
* Get the style tree of the style preferred by the current user
*
* @return array Style tree, most specific first
*
* @throws \phpbb\template\exception\user_object_not_available When user service was not set
*/
public function get_user_style()
{
if ($this->user === null)
{
throw new user_object_not_available();
}
$style_list = array(
$this->user->style['style_path'],
);
@@ -344,11 +353,20 @@ class twig extends \phpbb\template\base
$context_vars['.'][0], // To get normal vars
array(
'definition' => new \phpbb\template\twig\definition(),
'user' => $this->user,
'loops' => $context_vars, // To get loops
)
);
if ($this->user instanceof \phpbb\user)
{
$vars = array_merge(
$vars,
array(
'user' => $this->user,
)
);
}
// cleanup
unset($vars['loops']['.']);