diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:26:50 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:26:50 +0200 |
| commit | feb3987802e560bd9e9be9aaadb2df377b96d47b (patch) | |
| tree | 9898fa8ad8adb627e7613b0789d313dffdd63524 | |
| parent | 5b5463a98154539aa62552e945093f06572a4b13 (diff) | |
| parent | 5f044a015e622881126a55483de1f680abe29a17 (diff) | |
| download | forums-feb3987802e560bd9e9be9aaadb2df377b96d47b.tar forums-feb3987802e560bd9e9be9aaadb2df377b96d47b.tar.gz forums-feb3987802e560bd9e9be9aaadb2df377b96d47b.tar.bz2 forums-feb3987802e560bd9e9be9aaadb2df377b96d47b.tar.xz forums-feb3987802e560bd9e9be9aaadb2df377b96d47b.zip | |
Merge branch 'bug/nickvergessen/9512' into develop-olympus
* bug/nickvergessen/9512:
[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
Conflicts:
phpBB/docs/CHANGELOG.html
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_reports.html | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4572c220a8..93a2bb0fd6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -111,6 +111,7 @@ <li>[Fix] Fix table binding issues with PostgreSQL in board-wide feed. (Bug #58425)</li> <li>[Fix] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)</li> <li>[Fix] Various XHTML mistakes in ACP (Bug #58745)</li> + <li>[Fix] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> <li>[Feature] The memcache acm plugin now supports multiple memcache servers.</li> </ul> diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index 649154deb4..eefb24ee91 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -54,7 +54,7 @@ </dt> <dd class="moderation"> <span>{postrow.REPORTER_FULL} « {postrow.REPORT_TIME}<br /> - {L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a></span> + <!-- IF postrow.U_VIEWFORUM -->{L_FORUM}: <a href="{postrow.U_VIEWFORUM}">{postrow.FORUM_NAME}</a><!-- ELSE -->{postrow.FORUM_NAME}<!-- ENDIF --></span> </dd> <!-- ENDIF --> <dd class="mark"><input type="checkbox" name="report_id_list[]" value="{postrow.REPORT_ID}" /></dd> |