mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
Fix Bug #57455 - Fix problems with firebird by no longer using 'count' as a column alias.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10484 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
d26f66703b
commit
037aea067b
4 changed files with 7 additions and 5 deletions
|
@ -166,6 +166,7 @@
|
|||
<li>[Fix] Fix javascript bug in the smilies ACP. (Bug #55725)</li>
|
||||
<li>[Fix] Unify BBCode Selection across browsers. (Bug #38765)</li>
|
||||
<li>[Fix] Allow convertors to read in configuration from files. (Bug #57265) (patch by Dicky)</li>
|
||||
<li>[Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)</li>
|
||||
<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
|
||||
<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
|
||||
<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
|
||||
|
|
|
@ -941,11 +941,12 @@ class acp_icons
|
|||
{
|
||||
global $db;
|
||||
|
||||
$sql = "SELECT COUNT(*) AS count
|
||||
$sql = "SELECT COUNT(*) AS item_count
|
||||
FROM $table";
|
||||
$result = $db->sql_query($sql);
|
||||
$item_count = (int) $db->sql_fetchfield('count');
|
||||
$item_count = (int) $db->sql_fetchfield('item_count');
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
return $item_count;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -137,14 +137,14 @@ class phpbb_captcha_qa
|
|||
return false;
|
||||
}
|
||||
|
||||
$sql = 'SELECT COUNT(question_id) as count
|
||||
$sql = 'SELECT COUNT(question_id) AS question_count
|
||||
FROM ' . CAPTCHA_QUESTIONS_TABLE . "
|
||||
WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
|
||||
$result = $db->sql_query($sql);
|
||||
$row = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
return ((bool) $row['count']);
|
||||
return ((bool) $row['question_count']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -46,7 +46,7 @@ function generate_smilies($mode, $forum_id)
|
|||
|
||||
page_header($user->lang['SMILIES']);
|
||||
|
||||
$sql = 'SELECT COUNT(smiley_id) AS count
|
||||
$sql = 'SELECT COUNT(smiley_id) AS item_count
|
||||
FROM ' . SMILIES_TABLE . '
|
||||
GROUP BY smiley_url';
|
||||
$result = $db->sql_query($sql, 3600);
|
||||
|
|
Loading…
Add table
Reference in a new issue