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

Merge remote-tracking branch 'EXreaction/ticket/11667' into develop

Browse source 
* EXreaction/ticket/11667:
  [ticket/11667] Use @inheritdoc
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [ticket/11667] Make functions abstract in includeasset
  [ticket/11667] includeasset should be abstract
This commit is contained in:
Andreas Fischer 2013-07-24 02:45:35 +02:00
commit f0516b7d2a
4 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/language/en/acp/permissions_phpbb.php
View file

@ -102,6 +102,17 @@ $lang = array_merge($lang, array(
// Forum Permissions // Forum Permissions
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'ACL_F_LIST' => 'Can see forum',
'ACL_F_READ' => 'Can read forum',
'ACL_F_SEARCH' => 'Can search the forum',
'ACL_F_SUBSCRIBE' => 'Can subscribe forum',
'ACL_F_PRINT' => 'Can print topics',
'ACL_F_EMAIL' => 'Can email topics',
'ACL_F_BUMP' => 'Can bump topics',
'ACL_F_USER_LOCK' => 'Can lock own topics',
'ACL_F_DOWNLOAD' => 'Can download files',
'ACL_F_REPORT' => 'Can report posts',
'ACL_F_POST' => 'Can start new topics', 'ACL_F_POST' => 'Can start new topics',
'ACL_F_STICKY' => 'Can post stickies', 'ACL_F_STICKY' => 'Can post stickies',
'ACL_F_ANNOUNCE' => 'Can post announcements', 'ACL_F_ANNOUNCE' => 'Can post announcements',

17
phpBB/phpbb/template/twig/node/includeasset.php
View file

@ -7,7 +7,7 @@
* *
*/ */
class phpbb_template_twig_node_includeasset extends Twig_Node abstract class phpbb_template_twig_node_includeasset extends Twig_Node
{ {
/** @var Twig_Environment */ /** @var Twig_Environment */
protected $environment; protected $environment;
@ -57,4 +57,19 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
->raw("\n');\n") ->raw("\n');\n")
; ;
} }
/**
* Get the definition name
*
* @return string (e.g. 'SCRIPTS')
*/
abstract public function get_definition_name();
/**
* Append the output code for the asset
*
* @param Twig_Compiler A Twig_Compiler instance
* @return null
*/
abstract protected function append_asset(Twig_Compiler $compiler);
} }

7
phpBB/phpbb/template/twig/node/includecss.php
View file

@ -9,15 +9,16 @@
class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
{ {
/**
* {@inheritdoc}
*/
public function get_definition_name() public function get_definition_name()
{ {
return 'STYLESHEETS'; return 'STYLESHEETS';
} }
/** /**
* Compiles the node to PHP. * {@inheritdoc}
*
* @param Twig_Compiler A Twig_Compiler instance
*/ */
public function append_asset(Twig_Compiler $compiler) public function append_asset(Twig_Compiler $compiler)
{ {

7
phpBB/phpbb/template/twig/node/includejs.php
View file

@ -9,15 +9,16 @@
class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
{ {
/**
* {@inheritdoc}
*/
public function get_definition_name() public function get_definition_name()
{ {
return 'SCRIPTS'; return 'SCRIPTS';
} }
/** /**
* Compiles the node to PHP. * {@inheritdoc}
*
* @param Twig_Compiler A Twig_Compiler instance
*/ */
protected function append_asset(Twig_Compiler $compiler) protected function append_asset(Twig_Compiler $compiler)
{ {