Merge pull request #465 from norv/fixes_up

Fixes up
elkarte · May 27, 2013 · 7c31d0b · 7c31d0b
2 parents b7c18ce + 785e6bc
commit 7c31d0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/sources/controllers/MessageIndex.controller.php b/sources/controllers/MessageIndex.controller.php
@@ -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)
 		{

diff --git a/sources/controllers/Recent.controller.php b/sources/controllers/Recent.controller.php
@@ -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']))
 				{
@@ -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');
 	}
-}
+}