diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 21:29:05 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 21:29:05 +0000 |
| commit | 92c759456d95df22f3179c5628ac723c56020758 (patch) | |
| tree | edce37cbbc336135d2412df95e3f3f9866257836 | |
| parent | abff17ba87c95630dd9f3b84c409e6b899bac252 (diff) | |
| download | forums-92c759456d95df22f3179c5628ac723c56020758.tar forums-92c759456d95df22f3179c5628ac723c56020758.tar.gz forums-92c759456d95df22f3179c5628ac723c56020758.tar.bz2 forums-92c759456d95df22f3179c5628ac723c56020758.tar.xz forums-92c759456d95df22f3179c5628ac723c56020758.zip | |
Small language fix (#32795) and tiny bug fix
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8949 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 18e201aaf4..0cda530ec9 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -105,7 +105,7 @@ <li>[Fix] Use correct link for post author search. (Bug #32595)</li> <li>[Fix] Do not decrease topics counter when deleting shadow topics. (Bug #26495)</li> <li>[Fix] Send localised disapproval reasons in the recipients local language. (Bug #31645)</li> - <li>[Fix] Language typos/fixes. (Bug #27625, #30755, #34185)</li> + <li>[Fix] Language typos/fixes. (Bugs #27625, #30755, #34185, #32795)</li> <li>[Fix] Added missing terms parameter to search pagination. (Bug #34085)</li> <li>[Fix] Wrong table order in query obtaining posts if post id given.</li> <li>[Fix] Do not display reported topic icon for shadow topics. (Bug #13970)</li> diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c6b5018f01..ea62a75306 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -939,7 +939,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas $sql = "SELECT $type FROM " . BANLIST_TABLE . " WHERE $sql_where - AND ban_exclude = $ban_exclude"; + AND ban_exclude = " . (int) $ban_exclude; $result = $db->sql_query($sql); // Reset $sql_where, because we use it later... diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index ae711d4c29..feacd98f82 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -280,7 +280,7 @@ $lang = array_merge($lang, array( 'JABBER' => 'Jabber', 'JOINED' => 'Joined', - 'JUMP_PAGE' => 'Enter the page number you wish to go to.', + 'JUMP_PAGE' => 'Enter the page number you wish to go to', 'JUMP_TO' => 'Jump to', 'JUMP_TO_PAGE' => 'Click to jump to page…', |