Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes up #465

Merged
merged 2 commits into from
May 27, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions sources/controllers/MessageIndex.controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ function action_messageindex()

$topics_info = messageIndexTopics($board, $user_info['id'], $start, $maxindex, $context['sort_by'], $sort_column, $indexOptions);

// Prepare for links to guests (for search engines)
$context['pageindex_multiplier'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];

// Begin 'printing' the message index for current board.
foreach ($topics_info as $row)
{
Expand Down
4 changes: 2 additions & 2 deletions sources/controllers/Recent.controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@ function action_unread()
require_once(SUBSDIR . '/MessageIndex.subs.php');
$topics_participated_in = topicsParticipation($user_info['id'], $topic_ids);

foreach (topics_participated_in as $topic)
foreach ($topics_participated_in as $topic)
{
if (empty($context['topics'][$topic['id_topic']]['is_posted_in']))
{
Expand Down Expand Up @@ -1168,4 +1168,4 @@ function action_unread()
// Allow helpdesks and bug trackers and what not to add their own unread data (just add a template_layer to show custom stuff in the template!)
call_integration_hook('integrate_unread_list');
}
}
}