Commit c557f348 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Fix SQL query to retrieve language setting

In commit e171f6f3

 (Migrate all DB code to use PDO, 2012-08-08),
PDOStatement::fetchAll() was introduced as a drop-in replacement for
mysql_fetch_array(). However, PDOStatement::fetchAll() returns a list of
all results while mysql_fetch_array() returns a single result only.
Instead of adding the missing indirection, simplify the code by using
PDO::fetchColumn().

Also add some safeguards to prevent warnings if the result set returned
by the query is empty.
Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 62341a3b
......@@ -111,14 +111,16 @@ function set_lang() {
$result = $dbh->query($q);
if ($result) {
$row = $result->fetchAll();
$LANG = $row[0];
$LANG = $result->fetchColumn(0);
if (!$LANG) {
unset($LANG);
}
}
$update_cookie = 1;
}
# Set $LANG to default if nothing is valid.
if (!array_key_exists($LANG, $SUPPORTED_LANGS)) {
if (!isset($LANG) || !array_key_exists($LANG, $SUPPORTED_LANGS)) {
$LANG = config_get('options', 'default_lang');
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment