1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

Merge remote-tracking branch 'imkingdavid/ticket/10463' into develop

* imkingdavid/ticket/10463:
  [ticket/10463] removed extra comma in malformed query in acp_styles.php
This commit is contained in:
Andreas Fischer 2011-12-16 10:46:59 +01:00
commit c575fb33f6

View File

@ -2400,7 +2400,7 @@ version = {VERSION}
$select_bf = '';
}
$sql = "SELECT {$mode}_id, {$mode}_name, {$mode}_path, $select_bf
$sql = "SELECT {$mode}_id, {$mode}_name, {$mode}_path $select_bf
FROM $sql_from
WHERE {$mode}_name = '" . $db->sql_escape($cfg_data['inherit_from']) . "'
AND {$mode}_inherits_id = 0";