3 files changed, 5 insertions, 12 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index d32ed4b959..9ca2e19124 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1056,11 +1056,8 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
 
 		$template->assign_vars(array(
 			"PAGINATION" => generate_pagination($base_url, $total_match_count, $per_page, $start),
-			"ON_PAGE" => floor( $start / $per_page ) + 1,
-			"TOTAL_PAGES" => ceil( $total_match_count / $per_page ),
+			"PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page )), 
 
-			"L_OF" => $lang['of'],
-			"L_PAGE" => $lang['Page'],
 			"L_GOTO_PAGE" => $lang['Goto_page'])
 		);
 
diff --git a/phpBB/templates/subSilver/search_results_posts.tpl b/phpBB/templates/subSilver/search_results_posts.tpl
index 8136106994..0a500cdba8 100644
--- a/phpBB/templates/subSilver/search_results_posts.tpl
+++ b/phpBB/templates/subSilver/search_results_posts.tpl
@@ -39,10 +39,8 @@
 </table>
 <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
   <tr> 
-	<td align="left" valign="top"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> 
-	  {L_OF} <b>{TOTAL_PAGES}</b></span></td>
-	<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><span class="gensmall"><br />
-	  {S_TIMEZONE}</span></td>
+	<td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
+	<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
   </tr>
 </table>
 <table width="100%" cellspacing="2" border="0" align="center">
diff --git a/phpBB/templates/subSilver/search_results_topics.tpl b/phpBB/templates/subSilver/search_results_topics.tpl
index 7cbb17acb9..b1df6c5240 100644
--- a/phpBB/templates/subSilver/search_results_topics.tpl
+++ b/phpBB/templates/subSilver/search_results_topics.tpl
@@ -43,10 +43,8 @@
 </table>
 <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
   <tr> 
-	<td align="left" valign="top"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> 
-	  {L_OF} <b>{TOTAL_PAGES}</b></span></td>
-	<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><span class="gensmall"><br />
-	  {S_TIMEZONE}</span></td>
+	<td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
+	<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
   </tr>
 </table>
 <table width="100%" cellspacing="2" border="0" align="center">