1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

* remotes/upstream/develop-olympus:
  [ticket/11829] Use report_closed to determine status in MCP report_details

Conflicts:
	phpBB/styles/prosilver/template/mcp_post.html
This commit is contained in:
Nathan Guse
2013-09-12 14:57:26 -05:00
4 changed files with 5 additions and 3 deletions

View File

@@ -28,7 +28,7 @@
</tr>
<!-- ENDIF -->
<tr>
<td class="cat" align="center" colspan="2"><!-- IF S_POST_REPORTED --><input class="btnmain" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /><!-- ELSE -->{L_REPORT_CLOSED}<!-- ENDIF --> &nbsp; <input class="btnlite" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" /></td>
<td class="cat" align="center" colspan="2"><!-- IF not S_REPORT_CLOSED --><input class="btnmain" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /><!-- ELSE -->{L_REPORT_CLOSED}<!-- ENDIF --> &nbsp; <input class="btnlite" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" /></td>
</tr>
</table>