1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00

Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page

Conflicts:
	phpBB/adm/style/acp_users_overview.html
This commit is contained in:
Joas Schilling
2014-03-22 15:13:41 +01:00
2 changed files with 15 additions and 1 deletions

View File

@@ -30,7 +30,20 @@
</dl>
<dl>
<dt><label>{L_POSTS}{L_COLON}</label></dt>
<dd><strong>{USER_POSTS}</strong><!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --> (<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --> ({L_POSTS_IN_QUEUE})<!-- ENDIF --></dd>
<dd>
<strong>
<!-- IF USER_HAS_POSTS and U_SEARCH_USER -->
<a href="{U_SEARCH_USER}">{USER_POSTS}</a>
<!-- ELSE -->
{USER_POSTS}
<!-- ENDIF -->
</strong>
<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE -->
(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)
<!-- ELSEIF POSTS_IN_QUEUE -->
({L_POSTS_IN_QUEUE})
<!-- ENDIF -->
</dd>
</dl>
<dl>
<dt><label>{L_WARNINGS}{L_COLON}</label></dt>