diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 9db0fc6521..5fb9a12cda 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -384,7 +384,7 @@
 		<!-- IF .pagination -->
 			&bull; <!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
-			&bull; {S_ON_PAGE}
+			&bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
 	<!-- ENDIF -->
 	</div>
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index 04f818f95a..1fc1261489 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -11,7 +11,7 @@
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
-var on_page = '{ON_PAGE}';
+var on_page = '{CURRENT_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL|e('js')}';
 
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index 9c4c8a2960..0ca751cd7e 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -10,7 +10,7 @@
 <script type="text/javascript">
 // <![CDATA[
 var jump_page = '{LA_JUMP_PAGE}{L_COLON}';
-var on_page = '{ON_PAGE}';
+var on_page = '{CURRENT_PAGE}';
 var per_page = '{PER_PAGE}';
 var base_url = '{BASE_URL|e('js')}';
 
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index e710260b35..b0b9fdbd15 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1222,7 +1222,6 @@ class acp_attachments
 					'TOTAL_FILES'		=> $num_files,
 					'TOTAL_SIZE'		=> get_formatted_filesize($total_size),
 
-					'S_ON_PAGE'			=> $pagination->on_page($base_url, $num_files, $attachments_per_page, $start),
 					'S_LIMIT_DAYS'		=> $s_limit_days,
 					'S_SORT_KEY'		=> $s_sort_key,
 					'S_SORT_DIR'		=> $s_sort_dir)
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index ec78e0b32b..7ecedcf51e 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -727,7 +727,6 @@ class acp_groups
 					'S_GROUP_SPECIAL'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? true : false,
 					'S_ACTION_OPTIONS'	=> $s_action_options,
 
-					'S_ON_PAGE'		=> $pagination->on_page($base_url, $total_members, $config['topics_per_page'], $start),
 					'GROUP_NAME'	=> ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
 
 					'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index 305ba9ac69..140815f06a 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -295,7 +295,6 @@ class acp_inactive
 			'S_LIMIT_DAYS'	=> $s_limit_days,
 			'S_SORT_KEY'	=> $s_sort_key,
 			'S_SORT_DIR'	=> $s_sort_dir,
-			'S_ON_PAGE'		=> $pagination->on_page($base_url, $inactive_count, $per_page, $start),
 			'USERS_PER_PAGE'	=> $per_page,
 
 			'U_ACTION'		=> $this->u_action . "&amp;$u_sort_param&amp;users_per_page=$per_page&amp;start=$start",
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php
index 0ffea2737b..10852e3a68 100644
--- a/phpBB/includes/acp/acp_logs.php
+++ b/phpBB/includes/acp/acp_logs.php
@@ -138,8 +138,6 @@ class acp_logs
 			'L_EXPLAIN'		=> $l_title_explain,
 			'U_ACTION'		=> $this->u_action . "&amp;$u_sort_param$keywords_param&amp;start=$start",
 
-			'S_ON_PAGE'		=> $pagination->on_page($base_url, $log_count, $config['topics_per_page'], $start),
-
 			'S_LIMIT_DAYS'	=> $s_limit_days,
 			'S_SORT_KEY'	=> $s_sort_key,
 			'S_SORT_DIR'	=> $s_sort_dir,
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index fbff6a73da..87582dcedb 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1174,7 +1174,6 @@ class acp_users
 
 				$template->assign_vars(array(
 					'S_FEEDBACK'	=> true,
-					'S_ON_PAGE'		=> $pagination->on_page($base_url, $log_count, $config['topics_per_page'], $start),
 
 					'S_LIMIT_DAYS'	=> $s_limit_days,
 					'S_SORT_KEY'	=> $s_sort_key,
@@ -2130,7 +2129,6 @@ class acp_users
 
 				$template->assign_vars(array(
 					'S_ATTACHMENTS'		=> true,
-					'S_ON_PAGE'			=> $pagination->on_page($base_url, $num_attachments, $config['topics_per_page'], $start),
 					'S_SORT_KEY'		=> $s_sort_key,
 					'S_SORT_DIR'		=> $s_sort_dir,
 				));
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index a3b2184d48..7c1c61dae7 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -135,7 +135,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 
 		'S_MCP_ACTION'			=> $url . "&amp;i=$id&amp;forum_action=$action&amp;mode=$mode&amp;start=$start" . (($merge_select) ? $selected_ids : ''),
 
-		'PAGE_NUMBER'			=> $pagination->on_page($base_url, $forum_topics, $topics_per_page, $start),
 		'TOTAL_TOPICS'			=> $user->lang('VIEW_FORUM_TOPICS', (int) $forum_topics),
 	));
 
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index ac7896606a..7bcb0fc477 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -177,7 +177,6 @@ class mcp_logs
 		$pagination->generate_template_pagination($base_url, 'pagination', 'start', $log_count, $config['topics_per_page'], $start);
 
 		$template->assign_vars(array(
-			'PAGE_NUMBER'		=> $pagination->on_page($base_url, $log_count, $config['topics_per_page'], $start),
 			'TOTAL'				=> $user->lang('TOTAL_LOGS', (int) $log_count),
 
 			'L_TITLE'			=> $user->lang['MCP_LOGS'],
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index 055ca0e882..28de8724be 100644
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -229,7 +229,6 @@ class mcp_notes
 
 			'L_TITLE'			=> $user->lang['MCP_NOTES_USER'],
 
-			'PAGE_NUMBER'		=> $pagination->on_page($base_url, $log_count, $config['topics_per_page'], $start),
 			'TOTAL_REPORTS'		=> $user->lang('LIST_REPORTS', (int) $log_count),
 
 			'RANK_TITLE'		=> $rank_title,
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index d0801a2b47..008984b1c3 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -309,7 +309,6 @@ class mcp_pm_reports
 					'S_MCP_ACTION'			=> $this->u_action,
 					'S_CLOSED'				=> ($mode == 'pm_reports_closed') ? true : false,
 
-					'PAGE_NUMBER'			=> $pagination->on_page($base_url, $total, $config['topics_per_page'], $start),
 					'TOTAL'					=> $total,
 					'TOTAL_REPORTS'			=> $user->lang('LIST_REPORTS', (int) $total),
 					)
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 9f9c22a5c5..a46c4bd499 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -547,7 +547,6 @@ class mcp_queue
 					'S_TOPICS'				=> $is_topics,
 					'S_RESTORE'				=> $is_restore,
 
-					'PAGE_NUMBER'			=> $pagination->on_page($base_url, $total, $config['topics_per_page'], $start),
 					'TOPIC_ID'				=> $topic_id,
 					'TOTAL'					=> $user->lang(((!$is_topics) ? 'VIEW_TOPIC_POSTS' : 'VIEW_FORUM_TOPICS'), (int) $total),
 				));
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 954f8a8349..8026e071cd 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -423,7 +423,6 @@ class mcp_reports
 					'S_FORUM_OPTIONS'		=> $forum_options,
 					'S_CLOSED'				=> ($mode == 'reports_closed') ? true : false,
 
-					'PAGE_NUMBER'			=> $pagination->on_page($base_url, $total, $config['topics_per_page'], $start),
 					'TOPIC_ID'				=> $topic_id,
 					'TOTAL'					=> $total,
 					'TOTAL_REPORTS'			=> $user->lang('LIST_REPORTS', (int) $total),
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index a4c561a3bf..cdb88bf2bf 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -343,7 +343,6 @@ function mcp_topic_view($id, $mode, $action)
 		'RETURN_TOPIC'		=> sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_info['forum_id']}&amp;t={$topic_info['topic_id']}&amp;start=$start") . '">', '</a>'),
 		'RETURN_FORUM'		=> sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", "f={$topic_info['forum_id']}&amp;start=$start") . '">', '</a>'),
 
-		'PAGE_NUMBER'		=> $pagination->on_page($base_url, $total, $posts_per_page, $start),
 		'TOTAL_POSTS'		=> $user->lang('VIEW_TOPIC_POSTS', (int) $total),
 	));
 }
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index e39bddec5b..d396d004dc 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -186,7 +186,6 @@ class mcp_warn
 			'S_SELECT_SORT_KEY'		=> $s_sort_key,
 			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
 
-			'PAGE_NUMBER'		=> $pagination->on_page($base_url, $user_count, $config['topics_per_page'], $start),
 			'TOTAL_USERS'		=> $user->lang('LIST_USERS', (int) $user_count),
 		));
 	}
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index e687ee9cdc..6a5b48a181 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -178,7 +178,6 @@ class ucp_attachments
 		$pagination->generate_template_pagination($base_url, 'pagination', 'start', $num_attachments, $config['topics_per_page'], $start);
 
 		$template->assign_vars(array(
-			'PAGE_NUMBER'			=> $pagination->on_page($base_url, $num_attachments, $config['topics_per_page'], $start),
 			'TOTAL_ATTACHMENTS'		=> $num_attachments,
 
 			'L_TITLE'				=> $user->lang['UCP_ATTACHMENTS'],
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index a17c87e5a1..373d9433b2 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -821,7 +821,6 @@ class ucp_groups
 						$template->assign_vars(array(
 							'S_LIST'			=> true,
 							'S_ACTION_OPTIONS'	=> $s_action_options,
-							'S_ON_PAGE'			=> $pagination->on_page($template, $user, $base_url, $total_members, $config['topics_per_page'], $start),
 
 							'U_ACTION'			=> $this->u_action . "&amp;g=$group_id",
 							'S_UCP_ACTION'		=> $this->u_action . "&amp;g=$group_id",
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index ddea336ce9..3ccf3e3545 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -671,7 +671,6 @@ class ucp_main
 			$pagination->generate_template_pagination($this->u_action, 'pagination', 'start', $topics_count, $config['topics_per_page'], $start);
 
 			$template->assign_vars(array(
-				'PAGE_NUMBER'	=> $pagination->on_page($this->u_action, $topics_count, $config['topics_per_page'], $start),
 				'TOTAL_TOPICS'	=> $user->lang('VIEW_FORUM_TOPICS', (int) $topics_count),
 			));
 		}
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index c5963a1ebc..7c487b9073 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -154,7 +154,6 @@ class ucp_notifications
 				$pagination->generate_template_pagination($base_url, 'pagination', 'start', $notifications['total_count'], $config['topics_per_page'], $start);
 
 				$template->assign_vars(array(
-					'PAGE_NUMBER'	=> $pagination->on_page($base_url, $notifications['total_count'], $config['topics_per_page'], $start),
 					'TOTAL_COUNT'	=> $notifications['total_count'],
 					'U_MARK_ALL'	=> $base_url . '&amp;mark=all&amp;token=' . generate_link_hash('mark_all_notifications_read'),
 				));
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 0ea94835f2..a567283543 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -458,7 +458,6 @@ function get_pm_from($folder_id, $folder, $user_id)
 	$pagination->generate_template_pagination($base_url, 'pagination', 'start', $pm_count, $config['topics_per_page'], $start);
 
 	$template->assign_vars(array(
-		'PAGE_NUMBER'		=> $pagination->on_page($base_url, $pm_count, $config['topics_per_page'], $start),
 		'TOTAL_MESSAGES'	=> $user->lang('VIEW_PM_MESSAGES', (int) $pm_count),
 
 		'POST_IMG'		=> (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'POST_PM_LOCKED') : $user->img('button_pm_new', 'POST_NEW_PM'),
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 16e4c86a4e..e927429810 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1633,7 +1633,6 @@ switch ($mode)
 
 		// Generate page
 		$template->assign_vars(array(
-			'PAGE_NUMBER'	=> $pagination->on_page($pagination_url, $total_users, $config['topics_per_page'], $start),
 			'TOTAL_USERS'	=> $user->lang('LIST_USERS', (int) $total_users),
 
 			'PROFILE_IMG'	=> $user->img('icon_user_profile', $user->lang['PROFILE']),
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php
index 467dc2157f..8820b89431 100644
--- a/phpBB/phpbb/pagination.php
+++ b/phpBB/phpbb/pagination.php
@@ -76,107 +76,104 @@ class pagination
 	public function generate_template_pagination($base_url, $block_var_name, $start_name, $num_items, $per_page, $start = 1, $reverse_count = false, $ignore_on_page = false)
 	{
 		$total_pages = ceil($num_items / $per_page);
-
-		if ($total_pages == 1 || !$num_items)
-		{
-			return;
-		}
-
 		$on_page = $this->get_on_page($per_page, $start);
-
-		if ($reverse_count)
-		{
-			$start_page = ($total_pages > 5) ? $total_pages - 4 : 1;
-			$end_page = $total_pages;
-		}
-		else
-		{
-			// What we're doing here is calculating what the "start" and "end" pages should be. We
-			// do this by assuming pagination is "centered" around the currently active page with
-			// the three previous and three next page links displayed. Anything more than that and
-			// we display the ellipsis, likewise anything less.
-			//
-			// $start_page is the page at which we start creating the list. When we have five or less
-			// pages we start at page 1 since there will be no ellipsis displayed. Anymore than that
-			// and we calculate the start based on the active page. This is the min/max calculation.
-			// First (max) would we end up starting on a page less than 1? Next (min) would we end
-			// up starting so close to the end that we'd not display our minimum number of pages.
-			//
-			// $end_page is the last page in the list to display. Like $start_page we use a min/max to
-			// determine this number. Again at most five pages? Then just display them all. More than
-			// five and we first (min) determine whether we'd end up listing more pages than exist.
-			// We then (max) ensure we're displaying the minimum number of pages.
-			$start_page = ($total_pages > 5) ? min(max(1, $on_page - 3), $total_pages - 4) : 1;
-			$end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 3), 5) : $total_pages;
-		}
-
 		$u_previous_page = $u_next_page = '';
-		if ($on_page != 1)
+
+		if ($total_pages > 1)
 		{
-			$u_previous_page = $this->generate_page_link($base_url, $on_page - 1, $start_name, $per_page);
-
-			$this->template->assign_block_vars($block_var_name, array(
-				'PAGE_NUMBER'	=> '',
-				'PAGE_URL'		=> $u_previous_page,
-				'S_IS_CURRENT'	=> false,
-				'S_IS_PREV'		=> true,
-				'S_IS_NEXT'		=> false,
-				'S_IS_ELLIPSIS'	=> false,
-			));
-		}
-
-		// This do...while exists purely to negate the need for start and end assign_block_vars, i.e.
-		// to display the first and last page in the list plus any ellipsis. We use this loop to jump
-		// around a little within the list depending on where we're starting (and ending).
-		$at_page = 1;
-		do
-		{
-			// We decide whether to display the ellipsis during the loop. The ellipsis is always
-			// displayed as either the second or penultimate item in the list. So are we at either
-			// of those points and of course do we even need to display it, i.e. is the list starting
-			// on at least page 3 and ending three pages before the final item.
-			$this->template->assign_block_vars($block_var_name, array(
-				'PAGE_NUMBER'	=> $at_page,
-				'PAGE_URL'		=> $this->generate_page_link($base_url, $at_page, $start_name, $per_page),
-				'S_IS_CURRENT'	=> (!$ignore_on_page && $at_page == $on_page),
-				'S_IS_NEXT'		=> false,
-				'S_IS_PREV'		=> false,
-				'S_IS_ELLIPSIS'	=> ($at_page == 2 && $start_page > 2) || ($at_page == $total_pages - 1 && $end_page < $total_pages - 1),
-			));
-
-			// We may need to jump around in the list depending on whether we have or need to display
-			// the ellipsis. Are we on page 2 and are we more than one page away from the start
-			// of the list? Yes? Then we jump to the start of the list. Likewise are we at the end of
-			// the list and are there more than two pages left in total? Yes? Then jump to the penultimate
-			// page (so we can display the ellipsis next pass). Else, increment the counter and keep
-			// going
-			if ($at_page == 2 && $at_page < $start_page - 1)
+			if ($reverse_count)
 			{
-				$at_page = $start_page;
-			}
-			else if ($at_page == $end_page && $end_page < $total_pages - 1)
-			{
-				$at_page = $total_pages - 1;
+				$start_page = ($total_pages > 5) ? $total_pages - 4 : 1;
+				$end_page = $total_pages;
 			}
 			else
 			{
-				$at_page++;
+				// What we're doing here is calculating what the "start" and "end" pages should be. We
+				// do this by assuming pagination is "centered" around the currently active page with
+				// the three previous and three next page links displayed. Anything more than that and
+				// we display the ellipsis, likewise anything less.
+				//
+				// $start_page is the page at which we start creating the list. When we have five or less
+				// pages we start at page 1 since there will be no ellipsis displayed. Anymore than that
+				// and we calculate the start based on the active page. This is the min/max calculation.
+				// First (max) would we end up starting on a page less than 1? Next (min) would we end
+				// up starting so close to the end that we'd not display our minimum number of pages.
+				//
+				// $end_page is the last page in the list to display. Like $start_page we use a min/max to
+				// determine this number. Again at most five pages? Then just display them all. More than
+				// five and we first (min) determine whether we'd end up listing more pages than exist.
+				// We then (max) ensure we're displaying the minimum number of pages.
+				$start_page = ($total_pages > 5) ? min(max(1, $on_page - 3), $total_pages - 4) : 1;
+				$end_page = ($total_pages > 5) ? max(min($total_pages, $on_page + 3), 5) : $total_pages;
 			}
-		}
-		while ($at_page <= $total_pages);
 
-		if ($on_page != $total_pages)
-		{
-			$u_next_page = $this->generate_page_link($base_url, $on_page + 1, $start_name, $per_page);
+			if ($on_page != 1)
+			{
+				$u_previous_page = $this->generate_page_link($base_url, $on_page - 1, $start_name, $per_page);
 
-			$this->template->assign_block_vars($block_var_name, array(
-				'PAGE_NUMBER'	=> '',
-				'PAGE_URL'		=> $u_next_page,
-				'S_IS_CURRENT'	=> false,
-				'S_IS_PREV'		=> false,
-				'S_IS_NEXT'		=> true,
-				'S_IS_ELLIPSIS'	=> false,
-			));
+				$this->template->assign_block_vars($block_var_name, array(
+					'PAGE_NUMBER'	=> '',
+					'PAGE_URL'		=> $u_previous_page,
+					'S_IS_CURRENT'	=> false,
+					'S_IS_PREV'		=> true,
+					'S_IS_NEXT'		=> false,
+					'S_IS_ELLIPSIS'	=> false,
+				));
+			}
+
+			// This do...while exists purely to negate the need for start and end assign_block_vars, i.e.
+			// to display the first and last page in the list plus any ellipsis. We use this loop to jump
+			// around a little within the list depending on where we're starting (and ending).
+			$at_page = 1;
+			do
+			{
+				// We decide whether to display the ellipsis during the loop. The ellipsis is always
+				// displayed as either the second or penultimate item in the list. So are we at either
+				// of those points and of course do we even need to display it, i.e. is the list starting
+				// on at least page 3 and ending three pages before the final item.
+				$this->template->assign_block_vars($block_var_name, array(
+					'PAGE_NUMBER'	=> $at_page,
+					'PAGE_URL'		=> $this->generate_page_link($base_url, $at_page, $start_name, $per_page),
+					'S_IS_CURRENT'	=> (!$ignore_on_page && $at_page == $on_page),
+					'S_IS_NEXT'		=> false,
+					'S_IS_PREV'		=> false,
+					'S_IS_ELLIPSIS'	=> ($at_page == 2 && $start_page > 2) || ($at_page == $total_pages - 1 && $end_page < $total_pages - 1),
+				));
+
+				// We may need to jump around in the list depending on whether we have or need to display
+				// the ellipsis. Are we on page 2 and are we more than one page away from the start
+				// of the list? Yes? Then we jump to the start of the list. Likewise are we at the end of
+				// the list and are there more than two pages left in total? Yes? Then jump to the penultimate
+				// page (so we can display the ellipsis next pass). Else, increment the counter and keep
+				// going
+				if ($at_page == 2 && $at_page < $start_page - 1)
+				{
+					$at_page = $start_page;
+				}
+				else if ($at_page == $end_page && $end_page < $total_pages - 1)
+				{
+					$at_page = $total_pages - 1;
+				}
+				else
+				{
+					$at_page++;
+				}
+			}
+			while ($at_page <= $total_pages);
+
+			if ($on_page != $total_pages)
+			{
+				$u_next_page = $this->generate_page_link($base_url, $on_page + 1, $start_name, $per_page);
+
+				$this->template->assign_block_vars($block_var_name, array(
+					'PAGE_NUMBER'	=> '',
+					'PAGE_URL'		=> $u_next_page,
+					'S_IS_CURRENT'	=> false,
+					'S_IS_PREV'		=> false,
+					'S_IS_NEXT'		=> true,
+					'S_IS_ELLIPSIS'	=> false,
+				));
+			}
 		}
 
 		// If the block_var_name is a nested block, we will use the last (most
@@ -203,6 +200,7 @@ class pagination
 			'U_' . $tpl_prefix . 'NEXT_PAGE'		=> ($on_page != $total_pages) ? $u_next_page : '',
 			$tpl_prefix . 'TOTAL_PAGES'		=> $total_pages,
 			$tpl_prefix . 'CURRENT_PAGE'	=> $on_page,
+			$tpl_prefix . 'PAGE_NUMBER'		=> $this->on_page($num_items, $per_page, $start),
 		);
 
 		if ($tpl_block_name)
@@ -229,24 +227,15 @@ class pagination
 
 	/**
 	* Return current page
-	* This function also sets certain specific template variables
 	*
-	* @param string $base_url the base url used to call this page, used by Javascript for popup jump to page
 	* @param int $num_items the total number of items, posts, topics, etc.
 	* @param int $per_page the number of items, posts, etc. per page
 	* @param int $start the item which should be considered currently active, used to determine the page we're on
 	* @return string Descriptive pagination string (e.g. "page 1 of 10")
 	*/
-	public function on_page($base_url, $num_items, $per_page, $start)
+	public function on_page($num_items, $per_page, $start)
 	{
 		$on_page = $this->get_on_page($per_page, $start);
-
-		$this->template->assign_vars(array(
-			'PER_PAGE'		=> $per_page,
-			'ON_PAGE'		=> $on_page,
-			'BASE_URL'		=> $base_url,
-		));
-
 		return $this->user->lang('PAGE_OF', $on_page, max(ceil($num_items / $per_page), 1));
 	}
 
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index 172bc952e4..cb54193c3f 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -1,4 +1,4 @@
-					<a href="#" class="pagination-trigger" title="{L_JUMP_TO_PAGE}" data-lang-jump-page="{L_JUMP_PAGE|e('html_attr')}{L_COLON}" data-on-page="{ON_PAGE}" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}">{PAGE_NUMBER}</a> &bull;
+					<a href="#" class="pagination-trigger" title="{L_JUMP_TO_PAGE}" data-lang-jump-page="{L_JUMP_PAGE|e('html_attr')}{L_COLON}" data-on-page="{CURRENT_PAGE}" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}">{PAGE_NUMBER}</a> &bull;
 					<ul>
 					<!-- BEGIN pagination -->
 						<!-- IF pagination.S_IS_PREV -->
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index 5772a735d3..df80135acb 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -164,7 +164,7 @@
 			<!-- IF .pagination --> 
 				<!-- INCLUDE pagination.html -->
 			<!-- ELSE --> 
-				{S_ON_PAGE}
+				{PAGE_NUMBER}
 			<!-- ENDIF -->
 		</li>
 	</ul>
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 9ca989ea8b..5da73bd70d 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -36,7 +36,7 @@ function popup(url, width, height, name)
 
 function jumpto()
 {
-	var page = prompt('{LA_JUMP_PAGE}{L_COLON}', '{ON_PAGE}');
+	var page = prompt('{LA_JUMP_PAGE}{L_COLON}', '{CURRENT_PAGE}');
 	var per_page = '{PER_PAGE}';
 	var base_url = '{BASE_URL|e('js')}';
 
diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
index 1499f90eaf..3099fcb1d8 100644
--- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html
+++ b/phpBB/styles/subsilver2/template/ucp_groups_manage.html
@@ -161,7 +161,7 @@
 		<!-- IF .pagination -->
 			<!-- INCLUDE pagination.html -->
 		<!-- ELSE -->
-			{S_ON_PAGE}
+			{PAGE_NUMBER}
 		<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 9a229a0770..7f194bbcef 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -635,7 +635,6 @@ $base_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((s
 $pagination->generate_template_pagination($base_url, 'pagination', 'start', $topics_count, $config['topics_per_page'], $start);
 
 $template->assign_vars(array(
-	'PAGE_NUMBER'	=> $pagination->on_page($base_url, $topics_count, $config['topics_per_page'], $start),
 	'TOTAL_TOPICS'	=> ($s_display_active) ? false : $user->lang('VIEW_FORUM_TOPICS', (int) $total_topic_count),
 ));
 
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index ef8bfb888b..68601b69b8 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -430,7 +430,6 @@ $template->assign_vars(array(
 	'TOTAL_REGISTERED_USERS_ONLINE'	=> $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)),
 	'TOTAL_GUEST_USERS_ONLINE'		=> $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter),
 	'LEGEND'						=> $legend,
-	'PAGE_NUMBER'					=> $pagination->on_page($base_url, $counter, $config['topics_per_page'], $start),
 
 	'U_SORT_USERNAME'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&amp;sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
 	'U_SORT_UPDATED'		=> append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=b&amp;sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&amp;sg=' . ((int) $show_guests)),
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 7f4c65bd5e..86ef331ac0 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -605,7 +605,6 @@ $template->assign_vars(array(
 	'TOPIC_AUTHOR_COLOUR'	=> get_username_string('colour', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
 	'TOPIC_AUTHOR'			=> get_username_string('username', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
 
-	'PAGE_NUMBER' 	=> $pagination->on_page($base_url, $total_posts, $config['posts_per_page'], $start),
 	'TOTAL_POSTS'	=> $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts),
 	'U_MCP' 		=> ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&amp;mode=topic_view&amp;f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start") . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : ''), true, $user->session_id) : '',
 	'MODERATORS'	=> (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode($user->lang['COMMA_SEPARATOR'], $forum_moderators[$forum_id]) : '',
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php
index 4e8083b47f..4c658cbd56 100644
--- a/tests/pagination/pagination_test.php
+++ b/tests/pagination/pagination_test.php
@@ -38,6 +38,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 				10,
 				10,
 				'pagination
+				:per_page:10
+				:current_page:2
+				:base_url:page.php
 				:previous::page.php
 				:else:1:page.php
 				:current:2:page.php?start=10
@@ -57,6 +60,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 				10,
 				20,
 				'pagination
+				:per_page:10
+				:current_page:3
+				:base_url:page.php
 				:previous::page.php?start=10
 				:else:1:page.php
 				:else:2:page.php?start=10
@@ -77,6 +83,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 				10,
 				10,
 				'pagination
+				:per_page:10
+				:current_page:2
+				:base_url:test/page/%d
 				:previous::test
 				:else:1:test
 				:current:2:test/page/2
@@ -96,6 +105,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 				10,
 				20,
 				'pagination
+				:per_page:10
+				:current_page:3
+				:base_url:test/page/%d
 				:previous::test/page/2
 				:else:1:test
 				:else:2:test/page/2
@@ -127,15 +139,10 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 	{
 		return array(
 			array(
-				'page.php',
 				10,
 				10,
 				0,
 				'PAGE_OF-1-1',
-				'on_page
-				per_page:10
-				on_page:1
-				base_url:page.php',
 			),
 		);
 	}
@@ -143,13 +150,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 	/**
 	* @dataProvider on_page_data
 	*/
-	public function test_on_page($base_url, $num_items, $per_page, $start_item, $expect_return, $expect)
+	public function test_on_page($num_items, $per_page, $start_item, $expect_return)
 	{
-		$this->assertEquals($expect_return, $this->pagination->on_page($base_url, $num_items, $per_page, $start_item));
-
-		$this->template->set_filenames(array('test' => 'on_page.html'));
-
-		$this->assertEquals(str_replace("\t", '', $expect), $this->display('test'));
+		$this->assertEquals($expect_return, $this->pagination->on_page($num_items, $per_page, $start_item));
 	}
 
 	public function validate_start_data()
diff --git a/tests/pagination/templates/on_page.html b/tests/pagination/templates/on_page.html
deleted file mode 100644
index 364bcf9f5e..0000000000
--- a/tests/pagination/templates/on_page.html
+++ /dev/null
@@ -1,4 +0,0 @@
-on_page
-per_page:{PER_PAGE}
-on_page:{ON_PAGE}
-base_url:{BASE_URL}
diff --git a/tests/pagination/templates/pagination.html b/tests/pagination/templates/pagination.html
index 7f2a329804..db63258585 100644
--- a/tests/pagination/templates/pagination.html
+++ b/tests/pagination/templates/pagination.html
@@ -1,4 +1,7 @@
 pagination
+:per_page:{PER_PAGE}
+:current_page:{CURRENT_PAGE}
+:base_url:{BASE_URL}
 <!-- BEGIN pagination -->
 <!-- IF pagination.S_IS_PREV -->:previous:{pagination.PAGE_NUMBER}:{pagination.PAGE_URL}
 <!-- ELSEIF pagination.S_IS_CURRENT -->:current:{pagination.PAGE_NUMBER}:{pagination.PAGE_URL}