diff --git a/includes/admin/assets/css/um-admin-global.css b/includes/admin/assets/css/um-admin-global.css
index 4f233bbc..fa568f62 100644
--- a/includes/admin/assets/css/um-admin-global.css
+++ b/includes/admin/assets/css/um-admin-global.css
@@ -131,11 +131,6 @@ a.um-delete{ color: #a00; }
line-height: 37px;
}
-#um_edit_role #title {
- width: calc( 100% - 40px );
- float:left;
-}
-
#um-roles .row-actions .reset a {
color:#a00;
}
diff --git a/includes/admin/core/list-tables/roles-list-table.php b/includes/admin/core/list-tables/roles-list-table.php
index 05bb9120..d98f4c29 100644
--- a/includes/admin/core/list-tables/roles-list-table.php
+++ b/includes/admin/core/list-tables/roles-list-table.php
@@ -229,7 +229,7 @@ class UM_Roles_List_Table extends WP_List_Table {
- return sprintf('%1$s %2$s', ''. ( ! empty( $item['_um_is_custom'] ) ? 'UM ' : '' ) . $item['name'] . '', $this->row_actions( $actions ) );
+ return sprintf('%1$s %2$s', '' . $item['name'] . '', $this->row_actions( $actions ) );
}
function column_roleid( $item ) {
@@ -325,16 +325,16 @@ foreach ( $wp_roles->roles as $roleID => $role_data ) {
switch( strtolower( $order ) ) {
case 'asc':
uasort( $roles, function( $a, $b ) {
- $a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name'];
- $b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name'];
+ //$a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name'];
+ //$b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name'];
return strnatcmp( $a['name'], $b['name'] );
} );
break;
case 'desc':
uasort( $roles, function( $a, $b ) {
- $a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name'];
- $b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name'];
+ //$a['name'] = ! empty( $a['_um_is_custom'] ) ? 'UM ' . $a['name'] : $a['name'];
+ //$b['name'] = ! empty( $b['_um_is_custom'] ) ? 'UM ' . $b['name'] : $b['name'];
return strnatcmp( $a['name'], $b['name'] ) * -1;
} );
diff --git a/includes/admin/templates/role/role-edit.php b/includes/admin/templates/role/role-edit.php
index 5d5186f8..8a2dc3bc 100644
--- a/includes/admin/templates/role/role-edit.php
+++ b/includes/admin/templates/role/role-edit.php
@@ -47,7 +47,7 @@ if ( ! empty( $_POST['role'] ) ) {
$all_roles = array_keys( get_editable_roles() );
if ( 'add' == $_GET['tab'] ) {
- if ( in_array( 'um_' . $id, $all_roles ) )
+ if ( in_array( 'um_' . $id, $all_roles ) || in_array( $id, $all_roles ) )
$error .= __( 'Role already exists!', 'ultimate-member' ) . '
';
}
@@ -118,10 +118,10 @@ $screen_id = $current_screen->id; ?>