diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-04 17:46:36 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-04 17:46:36 +0200 |
| commit | c28a213b1b80205c5e53df5764a408898eb75c7c (patch) | |
| tree | 9977826fdc1b96d69676adc85ff0fc961be64160 /phpBB/styles/prosilver | |
| parent | f3f82bd3776047ba99d0ba828ce43ff743e65b02 (diff) | |
| parent | bb7f8433441343eaaf0c15aa9f27c4227256e3c7 (diff) | |
| download | forums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar forums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar.gz forums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar.bz2 forums-c28a213b1b80205c5e53df5764a408898eb75c7c.tar.xz forums-c28a213b1b80205c5e53df5764a408898eb75c7c.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/mcp_post.html
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 10ec6f3ea9..81d1be795e 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -144,7 +144,7 @@ </div> </div> -<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER --> +<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER or S_MCP_POST_ADDITIONAL_OPTS --> <div class="panel"> <div class="inner"> @@ -168,6 +168,8 @@ </form> <!-- ENDIF --> + <!-- EVENT mcp_post_additional_options --> + <!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST --> <form method="post" id="mcp" action="{U_MCP_ACTION}"> |