diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-16 10:46:59 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-16 10:46:59 +0100 |
| commit | c575fb33f6e2a3e943dcd141593a1ec3e990798b (patch) | |
| tree | 57fcb9c0d85d82d44eaf13dbafd7db8b8f51fcb7 | |
| parent | 6233bde5ed57fd63f8c15f3c308c6f51579a39ed (diff) | |
| parent | a3e8d3b00b4f43be8dd0a4c109eacb51677e53e2 (diff) | |
| download | forums-c575fb33f6e2a3e943dcd141593a1ec3e990798b.tar forums-c575fb33f6e2a3e943dcd141593a1ec3e990798b.tar.gz forums-c575fb33f6e2a3e943dcd141593a1ec3e990798b.tar.bz2 forums-c575fb33f6e2a3e943dcd141593a1ec3e990798b.tar.xz forums-c575fb33f6e2a3e943dcd141593a1ec3e990798b.zip | |
Merge remote-tracking branch 'imkingdavid/ticket/10463' into develop
* imkingdavid/ticket/10463:
[ticket/10463] removed extra comma in malformed query in acp_styles.php
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index fc9acbbcb8..c480021507 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -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"; |