makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 06:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge style element name conflict code

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8712 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-07-29 14:35:32 +00:00
parent 7c79d0f860
commit db4011c9d9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/acp/acp_styles.php
View file

@ -2096,6 +2096,14 @@ parse_css_file = {PARSE_CSS_FILE}
$style_default = request_var('style_default', 0); $style_default = request_var('style_default', 0);
$store_db = request_var('store_db', 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)) if ($mode == 'style' && (!$template_id || !$theme_id || !$imageset_id))
{ {
$error[] = $user->lang['STYLE_ERR_NO_IDS']; $error[] = $user->lang['STYLE_ERR_NO_IDS'];
@ -2106,7 +2114,7 @@ parse_css_file = {PARSE_CSS_FILE}
$error[] = $user->lang['DEACTIVATE_DEFAULT']; $error[] = $user->lang['DEACTIVATE_DEFAULT'];
} }
if (!$name) if (!$name || $conflict)
{ {
$error[] = $user->lang[$l_type . '_ERR_STYLE_NAME']; $error[] = $user->lang[$l_type . '_ERR_STYLE_NAME'];
} }