diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-07-29 14:35:32 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-07-29 14:35:32 +0000 |
| commit | db4011c9d9c19426f1e7f2bb79f4ab8a7ded63d4 (patch) | |
| tree | a683538916abda87ac8e5b74b18b996782a1c95f | |
| parent | 7c79d0f860362f44a17fd0ed7aa75e3aa2de1860 (diff) | |
| download | forums-db4011c9d9c19426f1e7f2bb79f4ab8a7ded63d4.tar forums-db4011c9d9c19426f1e7f2bb79f4ab8a7ded63d4.tar.gz forums-db4011c9d9c19426f1e7f2bb79f4ab8a7ded63d4.tar.bz2 forums-db4011c9d9c19426f1e7f2bb79f4ab8a7ded63d4.tar.xz forums-db4011c9d9c19426f1e7f2bb79f4ab8a7ded63d4.zip | |
Merge style element name conflict code
git-svn-id: file:///svn/phpbb/trunk@8712 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 60e478b19d..02161f4180 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -2096,6 +2096,14 @@ parse_css_file = {PARSE_CSS_FILE} $style_default = request_var('style_default', 0); $store_db = request_var('store_db', 0); + $sql = "SELECT {$mode}_id + FROM $sql_from + WHERE {$mode}_id <> $style_id + AND {$mode}_name = '" . $db->sql_escape(strtolower($name)) . "'"; + $result = $db->sql_query($sql); + $conflict = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + if ($mode == 'style' && (!$template_id || !$theme_id || !$imageset_id)) { $error[] = $user->lang['STYLE_ERR_NO_IDS']; @@ -2106,7 +2114,7 @@ parse_css_file = {PARSE_CSS_FILE} $error[] = $user->lang['DEACTIVATE_DEFAULT']; } - if (!$name) + if (!$name || $conflict) { $error[] = $user->lang[$l_type . '_ERR_STYLE_NAME']; } |