mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
This commit is contained in:
Joas Schilling
2015-06-04 17:46:36 +02:00
parent f3f82bd377 bb7f843344
commit c28a213b1b
3 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/styles/prosilver/template/mcp_post.html
View File

@@ -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}">