diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-08-28 22:56:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-29 17:50:14 +0200 |
| commit | d9a93a9cdc0e9607582c7a7293c99b1c469dc6c3 (patch) | |
| tree | 026e6f6b0746f8af462ce2f2e249cdb07941cbeb /phpBB/viewtopic.php | |
| parent | 910f1602cda164ed15587e2e14a772896f3817f2 (diff) | |
| download | forums-d9a93a9cdc0e9607582c7a7293c99b1c469dc6c3.tar forums-d9a93a9cdc0e9607582c7a7293c99b1c469dc6c3.tar.gz forums-d9a93a9cdc0e9607582c7a7293c99b1c469dc6c3.tar.bz2 forums-d9a93a9cdc0e9607582c7a7293c99b1c469dc6c3.tar.xz forums-d9a93a9cdc0e9607582c7a7293c99b1c469dc6c3.zip | |
[feature/soft-delete] Fix missing AND in query
PHPBB3-9657
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 2b52e165c1..4c598ab204 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -277,7 +277,7 @@ if ($post_id) $sql = 'SELECT COUNT(p.post_id) AS prev_posts FROM ' . POSTS_TABLE . " p WHERE p.topic_id = {$topic_data['topic_id']} - " . phpbb_content_visibility::get_visibility_sql('post', $forum_id, 'p.'); + AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id, 'p.'); if ($sort_dir == 'd') { @@ -615,7 +615,7 @@ $template->assign_vars(array( 'REPLY_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED || $topic_data['topic_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'TOPIC_LOCKED') : $user->img('button_topic_reply', 'REPLY_TO_TOPIC'), 'EDIT_IMG' => $user->img('icon_post_edit', 'EDIT_POST'), 'DELETE_IMG' => $user->img('icon_post_delete', 'DELETE_POST'), - 'DELETED_IMG' => $user->img('icon_topic_deleted', 'POST_DELETED_RESTORE'), + 'DELETED_IMG' => $user->img('icon_topic_deleted', 'POST_DELETED_RESTORE'), 'INFO_IMG' => $user->img('icon_post_info', 'VIEW_INFO'), 'PROFILE_IMG' => $user->img('icon_user_profile', 'READ_PROFILE'), 'SEARCH_IMG' => $user->img('icon_user_search', 'SEARCH_USER_POSTS'), |