diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-22 17:48:44 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-22 17:48:44 +0200 |
| commit | dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317 (patch) | |
| tree | 4c23d23cb131a00d6266cb2286d660b36af92cb5 /phpBB/includes/functions.php | |
| parent | 2e787fa836dbfdcec7864b5f143520aec3752bd0 (diff) | |
| parent | 22232213f9a2354f8a38c3ca35faa46fc7085ec0 (diff) | |
| download | forums-dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317.tar forums-dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317.tar.gz forums-dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317.tar.bz2 forums-dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317.tar.xz forums-dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317.zip | |
Merge branch 'ticket/p/6855' into develop
* ticket/p/6855:
[ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0f6f992069..4088e92b63 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2038,7 +2038,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add // Make sure $per_page is a valid value $per_page = ($per_page <= 0) ? 1 : $per_page; - $seperator = '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>'; + $separator = '<span class="page-sep">' . $user->lang['COMMA_SEPARATOR'] . '</span>'; $total_pages = ceil($num_items / $per_page); if ($total_pages == 1 || !$num_items) @@ -2056,29 +2056,29 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add $start_cnt = min(max(1, $on_page - 4), $total_pages - 5); $end_cnt = max(min($total_pages, $on_page + 4), 6); - $page_string .= ($start_cnt > 1) ? ' ... ' : $seperator; + $page_string .= ($start_cnt > 1) ? ' ... ' : $separator; for ($i = $start_cnt + 1; $i < $end_cnt; $i++) { $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; if ($i < $end_cnt - 1) { - $page_string .= $seperator; + $page_string .= $separator; } } - $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator; + $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $separator; } else { - $page_string .= $seperator; + $page_string .= $separator; for ($i = 2; $i < $total_pages; $i++) { $page_string .= ($i == $on_page) ? '<strong>' . $i . '</strong>' : '<a href="' . $base_url . "{$url_delim}start=" . (($i - 1) * $per_page) . '">' . $i . '</a>'; if ($i < $total_pages) { - $page_string .= $seperator; + $page_string .= $separator; } } } |