diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2010-04-29 11:03:22 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-07-06 13:35:44 +0200 |
| commit | 22232213f9a2354f8a38c3ca35faa46fc7085ec0 (patch) | |
| tree | d329fb06f460e8bcffb6b3bb7e36f298f7f4a708 | |
| parent | dea1d660fb63b07451f1a43310de359251462644 (diff) | |
| download | forums-22232213f9a2354f8a38c3ca35faa46fc7085ec0.tar forums-22232213f9a2354f8a38c3ca35faa46fc7085ec0.tar.gz forums-22232213f9a2354f8a38c3ca35faa46fc7085ec0.tar.bz2 forums-22232213f9a2354f8a38c3ca35faa46fc7085ec0.tar.xz forums-22232213f9a2354f8a38c3ca35faa46fc7085ec0.zip | |
[ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]
PHPBB3-6855
| -rw-r--r-- | phpBB/includes/functions.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d88960ff1d..fb44992aad 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2021,7 +2021,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) @@ -2039,29 +2039,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; } } } diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 271542efdd..e622630b67 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1755,15 +1755,15 @@ function validate_jabber($jid) return false; } - $seperator_pos = strpos($jid, '@'); + $separator_pos = strpos($jid, '@'); - if ($seperator_pos === false) + if ($separator_pos === false) { return 'WRONG_DATA'; } - $username = substr($jid, 0, $seperator_pos); - $realm = substr($jid, $seperator_pos + 1); + $username = substr($jid, 0, $separator_pos); + $realm = substr($jid, $separator_pos + 1); if (strlen($username) == 0 || strlen($realm) < 3) { |