mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8700 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
c2133550d0
commit
fe72c1e3cf
1 changed files with 13 additions and 5 deletions
|
@ -2162,6 +2162,14 @@ inherit_from = {INHERIT_FROM}
|
||||||
$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'];
|
||||||
|
@ -2172,7 +2180,7 @@ inherit_from = {INHERIT_FROM}
|
||||||
$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'];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue