aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-04-18 19:33:05 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-04-18 19:33:05 +0200
commit771be9310de71978c81ef9ddf7b61fb849069ce2 (patch)
tree3fff66e605bace99a510722b95d625e849240f34
parente6a0e4caed0262507926bf70c86533efd2512e26 (diff)
downloadforums-771be9310de71978c81ef9ddf7b61fb849069ce2.tar
forums-771be9310de71978c81ef9ddf7b61fb849069ce2.tar.gz
forums-771be9310de71978c81ef9ddf7b61fb849069ce2.tar.bz2
forums-771be9310de71978c81ef9ddf7b61fb849069ce2.tar.xz
forums-771be9310de71978c81ef9ddf7b61fb849069ce2.zip
[ticket/8116] Correctly get other users who posted under IP
PHPBB3-8116
-rw-r--r--phpBB/includes/mcp/mcp_post.php8
-rw-r--r--phpBB/styles/prosilver/template/mcp_post.html16
2 files changed, 3 insertions, 21 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index dfc43d6cac..b5f2bf4f02 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -379,6 +379,7 @@ function mcp_post_details($id, $mode, $action)
$sql = 'SELECT poster_id, COUNT(poster_id) as postings
FROM ' . POSTS_TABLE . "
WHERE poster_ip = '" . $db->sql_escape($post_info['poster_ip']) . "'
+ AND poster_id <> " . (int) $post_info['poster_id'] . "
GROUP BY poster_id
ORDER BY postings DESC, poster_id ASC";
$result = $db->sql_query_limit($sql, $config['posts_per_page'], $start_users);
@@ -387,12 +388,7 @@ function mcp_post_details($id, $mode, $action)
while ($row = $db->sql_fetchrow($result))
{
$page_users++;
-
- // Fill the user select list with users who have posted under this IP
- if ($row['poster_id'] != $post_info['poster_id'])
- {
- $users_ary[$row['poster_id']] = $row;
- }
+ $users_ary[$row['poster_id']] = $row;
}
$db->sql_freeresult($result);
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index fc4a5b0a9d..5acdcef859 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -295,21 +295,7 @@
</table>
<div class="pagination">
- <ul>
- <!-- BEGIN pagination -->
- <!-- IF pagination.S_IS_PREV -->
- <li class="previous"><a href="{pagination.PAGE_URL}" rel="prev" role="button">{L_PREVIOUS}</a></li>
- <!-- ELSEIF pagination.S_IS_CURRENT -->
- <li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
- <!-- ELSEIF pagination.S_IS_ELLIPSIS -->
- <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
- <!-- ELSEIF pagination.S_IS_NEXT -->
- <li class="next"><a href="{pagination.PAGE_URL}" rel="next" role="button">{L_NEXT}</a></li>
- <!-- ELSE -->
- <li><a href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li>
- <!-- ENDIF -->
- <!-- END pagination -->
- </ul>
+ <!-- INCLUDE pagination.html -->
</div>
</div>
</div>