mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/15538] Fixes unrelated to the error

Browse Source 
PHPBB3-15538
This commit is contained in:
mrgoldy
2019-09-30 18:51:37 +02:00
committed by Marc Alexander
parent 971b905569
commit 23fae74bf2
6 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/template/twig/extension/icon.php
View File

@@ -15,7 +15,7 @@ namespace phpbb\template\twig\extension;
use phpbb\template\twig\environment;
abstract class icon extends \Twig\Extension\AbstractExtension
class icon extends \Twig\Extension\AbstractExtension
{
/** @var \phpbb\user */
protected $user;
@@ -48,7 +48,7 @@ abstract class icon extends \Twig\Extension\AbstractExtension
public function getFilters()
{
return [
new \Twig\TwigFilter('Png_path', [$this, 'png_path'], ['needs_environment' => true]),
new \Twig\TwigFilter('png_path', [$this, 'png_path'], ['needs_environment' => true]),
];
}
@@ -71,7 +71,7 @@ abstract class icon extends \Twig\Extension\AbstractExtension
* @param string $icon The icon name
* @return string
*/
protected function png_path(environment $environment, $icon)
public function png_path(environment $environment, $icon)
{
$board_url = defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH;
$web_path = $board_url ? generate_board_url() . '/' : $environment->get_web_root_path();
@@ -87,7 +87,7 @@ abstract class icon extends \Twig\Extension\AbstractExtension
* @param string $icon The icon name
* @return string
*/
protected function svg_clean(environment $environment, $icon)
public function svg_clean(environment $environment, $icon)
{
try
{
@@ -110,8 +110,10 @@ abstract class icon extends \Twig\Extension\AbstractExtension
return '';
}
foreach ($doc->childNodes as $child) {
if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
foreach ($doc->childNodes as $child)
{
if ($child->nodeType === XML_DOCUMENT_TYPE_NODE)
{
$child->parentNode->removeChild($child);
}
}

26
phpBB/phpbb/template/twig/extension/implode.php
View File

@@ -13,7 +13,7 @@
namespace phpbb\template\twig\extension;
abstract class implode extends \Twig\Extension\AbstractExtension
class implode extends \Twig\Extension\AbstractExtension
{
/**
* Returns the name of this extension.
@@ -50,7 +50,7 @@ abstract class implode extends \Twig\Extension\AbstractExtension
* @param mixed $arguments
* @return string
*/
protected function implode_attributes(...$arguments)
public function implode_attributes(...$arguments)
{
$string = '';
$attributes = [];
@@ -71,13 +71,17 @@ abstract class implode extends \Twig\Extension\AbstractExtension
}
else if (is_array($value))
{
if (is_integer($key) && is_string($value))
foreach ($value as $k => $v)
{
$attributes[] = $value;
}
else
{
$attributes[$key] = $value;
if (is_integer($k) && is_string($v))
{
$attributes[] = $v;
}
else
{
$attributes[$k] = $v;
}
}
}
else
@@ -92,11 +96,13 @@ abstract class implode extends \Twig\Extension\AbstractExtension
{
if (is_string($attribute))
{
$value = is_bool($value) ? ($value ? 'true' : 'false') : $value;
$string .= ' ' . $attribute . '="' . $value . '"';
}
else
{
$string .= ' ' . $attribute;
$string .= ' ' . $value;
}
}
@@ -129,7 +135,7 @@ abstract class implode extends \Twig\Extension\AbstractExtension
* @param mixed $arguments
* @return string The classes string prepended with a space
*/
protected function implode_classes(...$arguments)
public function implode_classes(...$arguments)
{
$classes = [];

4
phpBB/phpbb/template/twig/extension/macro.php
View File

@@ -15,7 +15,7 @@ namespace phpbb\template\twig\extension;
use phpbb\template\twig\environment;
abstract class macro extends \Twig\Extension\AbstractExtension implements \Twig\Extension\GlobalsInterface
class macro extends \Twig\Extension\AbstractExtension implements \Twig\Extension\GlobalsInterface
{
/** @var environment */
protected $twig;
@@ -37,7 +37,7 @@ abstract class macro extends \Twig\Extension\AbstractExtension implements \Twig\
*/
public function getName()
{
return 'macro';
return 'macros';
}
/**