3 files changed, 22 insertions, 28 deletions

diff --git a/sql/updates/auth/2013_09_10_13_auth_misc.sql b/sql/updates/auth/2013_09_10_13_auth_misc.sql
index 825028dcb5a..becedad564d 100644
--- a/sql/updates/auth/2013_09_10_13_auth_misc.sql
+++ b/sql/updates/auth/2013_09_10_13_auth_misc.sql
@@ -11,14 +11,14 @@ INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
 (@id+3, 'titles remove'),
 (@id+4, 'titles set'),
 (@id+5, 'titles set mask'),
-(@id+6, 'titles wp'),
-(@id+7, 'titles wp add'),
-(@id+8, 'titles wp event'),
-(@id+9, 'titles wp load'),
-(@id+10, 'titles wp modify'),
-(@id+11, 'titles wp unload'),
-(@id+12, 'titles wp reload'),
-(@id+13, 'titles wp show');
+(@id+6, 'wp'),
+(@id+7, 'wp add'),
+(@id+8, 'wp event'),
+(@id+9, 'wp load'),
+(@id+10, 'wp modify'),
+(@id+11, 'wp unload'),
+(@id+12, 'wp reload'),
+(@id+13, 'wp show');
 
 -- Add permissions to "corresponding Commands Role"
 DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+13;
diff --git a/sql/updates/world/2013_09_10_14_world_command.sql b/sql/updates/world/2013_09_10_14_world_command.sql
index 853dcc77fe0..36723992ed0 100644
--- a/sql/updates/world/2013_09_10_14_world_command.sql
+++ b/sql/updates/world/2013_09_10_14_world_command.sql
@@ -3,7 +3,6 @@
 SET @id = 742;
 
 -- Update command table with new RBAC permissions
-UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'tele';
 UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'ticket';
 UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'ticket assign';
 UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'ticket close';
diff --git a/sql/updates/world/2013_09_10_15_world_command.sql b/sql/updates/world/2013_09_10_15_world_command.sql
index ff70ba9b18d..1f90dfdf2a4 100644
--- a/sql/updates/world/2013_09_10_15_world_command.sql
+++ b/sql/updates/world/2013_09_10_15_world_command.sql
@@ -3,22 +3,17 @@
 SET @id = 761;
 
 -- Update command table with new RBAC permissions
-UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'ticket';
-UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'ticket assign';
-UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'ticket close';
-UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'ticket closedlist';
-UPDATE `command` SET `permission` = @id+4 WHERE `name` = 'ticket comment';
-UPDATE `command` SET `permission` = @id+5 WHERE `name` = 'ticket complete';
-UPDATE `command` SET `permission` = @id+6 WHERE `name` = 'ticket delete';
-UPDATE `command` SET `permission` = @id+7 WHERE `name` = 'ticket escalate';
-UPDATE `command` SET `permission` = @id+8 WHERE `name` = 'ticket escalatedlist';
-UPDATE `command` SET `permission` = @id+9 WHERE `name` = 'ticket list';
-UPDATE `command` SET `permission` = @id+10 WHERE `name` = 'ticket onlinelist';
-UPDATE `command` SET `permission` = @id+11 WHERE `name` = 'ticket reset';
-UPDATE `command` SET `permission` = @id+12 WHERE `name` = 'ticket response';
-UPDATE `command` SET `permission` = @id+13 WHERE `name` = 'ticket response append';
-UPDATE `command` SET `permission` = @id+14 WHERE `name` = 'ticket response appendln';
-UPDATE `command` SET `permission` = @id+15 WHERE `name` = 'ticket togglesystem';
-UPDATE `command` SET `permission` = @id+16 WHERE `name` = 'ticket unassign';
-UPDATE `command` SET `permission` = @id+17 WHERE `name` = 'ticket viewid';
-UPDATE `command` SET `permission` = @id+18 WHERE `name` = 'ticket viewname';
+UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'titles';
+UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'titles add';
+UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'titles current';
+UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'titles remove';
+UPDATE `command` SET `permission` = @id+4 WHERE `name` = 'titles set';
+UPDATE `command` SET `permission` = @id+5 WHERE `name` = 'titles set mask';
+UPDATE `command` SET `permission` = @id+6 WHERE `name` = 'wp';
+UPDATE `command` SET `permission` = @id+7 WHERE `name` = 'wp add';
+UPDATE `command` SET `permission` = @id+8 WHERE `name` = 'wp event';
+UPDATE `command` SET `permission` = @id+9 WHERE `name` = 'wp load';
+UPDATE `command` SET `permission` = @id+10 WHERE `name` = 'wp modify';
+UPDATE `command` SET `permission` = @id+11 WHERE `name` = 'wp unload';
+UPDATE `command` SET `permission` = @id+12 WHERE `name` = 'wp reload';
+UPDATE `command` SET `permission` = @id+13 WHERE `name` = 'wp show';