aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-11-09 14:44:52 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-11-09 14:44:52 +0000
commit9268c8e26ac1729ba7eb17a2454df2d4c3565a6e (patch)
tree1528e08f00d02e076872f1b94be7b936e5aff5c8 /phpBB/includes
parentc185c3b64bcba881f723eb2ea9fee35afe9c29ec (diff)
downloadforums-9268c8e26ac1729ba7eb17a2454df2d4c3565a6e.tar
forums-9268c8e26ac1729ba7eb17a2454df2d4c3565a6e.tar.gz
forums-9268c8e26ac1729ba7eb17a2454df2d4c3565a6e.tar.bz2
forums-9268c8e26ac1729ba7eb17a2454df2d4c3565a6e.tar.xz
forums-9268c8e26ac1729ba7eb17a2454df2d4c3565a6e.zip
#36525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9051 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_groups.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 96ac3de3ce..adc6487a8d 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -218,6 +218,15 @@ class acp_groups
}
else
{
+ if (!$group_id)
+ {
+ trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
+ else if ($action === 'delete' && $group_row['group_type'] == GROUP_SPECIAL)
+ {
+ trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
+
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'mark' => $mark_ary,
'g' => $group_id,
wnloaddrakx-dadaaf1fcfd690026514f0c76eeeb867b9ca5fa4.tar
drakx-dadaaf1fcfd690026514f0c76eeeb867b9ca5fa4.tar.gz
drakx-dadaaf1fcfd690026514f0c76eeeb867b9ca5fa4.tar.bz2
drakx-dadaaf1fcfd690026514f0c76eeeb867b9ca5fa4.tar.xz
drakx-dadaaf1fcfd690026514f0c76eeeb867b9ca5fa4.zip
add latest identifiers from pcmcia-cs-3.2.6
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/pcmcia_/probe.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mdk-stage1/pcmcia_/probe.c b/mdk-stage1/pcmcia_/probe.c
index 88853426d..bd1707b4f 100644
--- a/mdk-stage1/pcmcia_/probe.c
+++ b/mdk-stage1/pcmcia_/probe.c
@@ -118,9 +118,13 @@ pci_id_t pci_id[] = {
{ 0x1179, 0x060f, "yenta_socket", "Toshiba ToPIC97" },
{ 0x1179, 0x0617, "yenta_socket", "Toshiba ToPIC100" },
{ 0x119b, 0x1221, "i82365", "Omega Micro 82C092G" },
- { 0x1524, 0x1411, "yenta_socket", "ENE Technology CB1411" },
{ 0x8086, 0x1221, "i82092", "Intel 82092AA_0" },
{ 0x8086, 0x1222, "i82092", "Intel 82092AA_1" },
+ { 0x1524, 0x1211, "yenta_socket", "ENE 1211" },
+ { 0x1524, 0x1225, "yenta_socket", "ENE 1225" },
+ { 0x1524, 0x1410, "yenta_socket", "ENE 1410" },
+ { 0x1524, 0x1411, "yenta_socket", "ENE Technology CB1411" },
+ { 0x1524, 0x1420, "yenta_socket", "ENE 1420" },
};
#define PCI_COUNT (sizeof(pci_id)/sizeof(pci_id_t))