From 1bcd450f5aa5a67c9e3f801014f06cc1eec1bf13 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sat, 24 Sep 2016 16:39:42 +0200
Subject: [PATCH 01/50] Add suport of checkboxes roles on add user form

---
 controllers/checklist.php | 4 ++--
 multiple-roles.php        | 1 +
 views/checklist.html.php  | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index fabf181..9ed8cb3 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -27,7 +27,7 @@ public function __construct( $model ) {
 	 * @param string $hook The current admin screen.
 	 */
 	public function remove_dropdown( $hook ) {
-		if ( $hook != 'user-edit.php' )
+		if ( $hook != 'user-edit.php' && $hook != 'user-new.php' )
 			return;
 		wp_enqueue_script( 'md-multiple-roles', MDMR_URL . 'views/js/scripts.js', array( 'jquery' ) );
 	}
@@ -46,7 +46,7 @@ public function output_checklist( $user ) {
 		wp_nonce_field( 'update-md-multiple-roles', 'md_multiple_roles_nonce' );
 
 		$roles        = $this->model->get_roles();
-		$user_roles   = $user->roles;
+        $user_roles   = ( isset( $user->roles ) ) ? $user->roles : null;
 
 		include( MDMR_PATH . 'views/checklist.html.php' );
 
diff --git a/multiple-roles.php b/multiple-roles.php
index 27337e2..ad8eacc 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -25,6 +25,7 @@ function md_multiple_roles() {
 	add_action( 'admin_enqueue_scripts', array( $checklist, 'remove_dropdown' ) );
 	add_action( 'show_user_profile',     array( $checklist, 'output_checklist' ) );
 	add_action( 'edit_user_profile',     array( $checklist, 'output_checklist' ) );
+	add_action( 'user_new_form',         array( $checklist, 'output_checklist' ) );
 	add_action( 'profile_update',        array( $checklist, 'process_checklist' ) );
 	add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
 
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 4a7ad40..7248de3 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -17,7 +17,9 @@
 						type="checkbox"
 						name="md_multiple_roles[]"
 						value="<?php echo $name; ?>"
-						<?php checked( in_array( $name, $user_roles ) ); ?>
+                        <?php if ( ! is_null( $user_roles ) ) :
+                            checked( in_array( $name, $user_roles ) );
+                        endif; ?>
 					/>
 					<?php echo $label; ?>
 				</label>

From b6563d9b3c818296bba9775a3ec4e6535c4c64cc Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sat, 24 Sep 2016 16:43:37 +0200
Subject: [PATCH 02/50] Bump version to 1.2

---
 multiple-roles.php | 4 ++--
 readme.txt         | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index ad8eacc..82d257f 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,8 +2,8 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.0
-Author: Michael Dance
+Version: 1.1
+Author: Michael Dance, Florian Tiar
 Author URI: http://mikedance.com
 */
 
diff --git a/readme.txt b/readme.txt
index fb091ba..c7a8a3a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
 === Multiple Roles ===
-Contributors: SeventhSteel
+Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
 Tested up to: 4.2.1
-Stable tag: 1.0
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -58,5 +58,8 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.1 =
+* Add support of role checkbox in new user form (admin).
+
 = 1.0 =
 * Initial release.
\ No newline at end of file

From a713681c5c233535dbb19d10e02e8798e96f96cc Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Mon, 26 Sep 2016 13:57:52 +0200
Subject: [PATCH 03/50] Add gitignore for PHP storm file

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..180cb14
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+### WordPress template
+*.log
+.htaccess
+
+# PHP Storm files
+.idea
\ No newline at end of file

From 58d78143100df6e255de8c05d5d304b92c6bd96b Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Mon, 26 Sep 2016 14:10:06 +0200
Subject: [PATCH 04/50] Prepare i18n (add textdomain)

---
 controllers/column.php       |  2 +-
 languages/multiple-roles.pot | 34 ++++++++++++++++++++++++++++++++++
 multiple-roles.php           |  5 +++++
 views/checklist.html.php     |  4 ++--
 views/column.html.php        |  2 +-
 5 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 languages/multiple-roles.pot

diff --git a/controllers/column.php b/controllers/column.php
index 95c3ef1..832941b 100644
--- a/controllers/column.php
+++ b/controllers/column.php
@@ -29,7 +29,7 @@ public function __construct( $model ) {
 	 */
 	public function replace_column( $columns ) {
 		unset( $columns['role'] );
-		$columns['md_multiple_roles_column'] = 'Roles';
+		$columns['md_multiple_roles_column'] = __( 'Roles', MDMR_TXTDOMAIN );
 		return $columns;
 	}
 
diff --git a/languages/multiple-roles.pot b/languages/multiple-roles.pot
new file mode 100644
index 0000000..603884d
--- /dev/null
+++ b/languages/multiple-roles.pot
@@ -0,0 +1,34 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Multiple Roles\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-26 14:09+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Florian TIAR <contact@tiar-florian.fr>\n"
+"Language-Team: Florian TIAR <contact@tiar-florian.fr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
+"X-Generator: Poedit 1.8.6\n"
+"X-Poedit-KeywordsList: _e;__;_x;esc_html__;esc_html_e;_n;_ex;esc_html_x;"
+"esc_attr_x;translate;esc_attr__;esc_attr_e\n"
+"X-Poedit-Basepath: ..\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPathExcluded-0: node_modules\n"
+"X-Poedit-SearchPathExcluded-1: assets\n"
+"X-Poedit-SearchPathExcluded-2: fields\n"
+
+#: controllers/column.php:32 views/checklist.html.php:11
+msgid "Roles"
+msgstr ""
+
+#: views/checklist.html.php:8
+msgid "Permissions"
+msgstr ""
+
+#: views/column.html.php:14
+msgid "None"
+msgstr ""
diff --git a/multiple-roles.php b/multiple-roles.php
index 82d257f..4ee0206 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -5,10 +5,12 @@
 Version: 1.1
 Author: Michael Dance, Florian Tiar
 Author URI: http://mikedance.com
+Text Domain: multiple-roles
 */
 
 define( 'MDMR_PATH', plugin_dir_path( __FILE__ ) );
 define( 'MDMR_URL', plugin_dir_url( __FILE__ ) );
+define( 'MDMR_TXTDOMAIN', 'multiple-roles' );
 
 /**
  * Load files and add hooks to get things rolling.
@@ -33,6 +35,9 @@ function md_multiple_roles() {
 	add_filter( 'manage_users_columns',       array( $column, 'replace_column' ), 11 );
 	add_filter( 'manage_users_custom_column', array( $column, 'output_column_content' ), 10, 3 );
 
+    add_action( 'init', function() {
+        load_plugin_textdomain( MDMR_TXTDOMAIN, false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+    } );
 }
 
 md_multiple_roles();
\ No newline at end of file
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 7248de3..889038e 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -5,10 +5,10 @@
  * @var $roles array All WordPress roles in name => label pairs.
  * @var $user_roles array An array of role names belonging to the current user.
  */
-?><h3>Permissions</h3>
+?><h3><?php _e( 'Permissions', MDMR_TXTDOMAIN ); ?></h3>
 <table class="form-table">
 	<tr>
-		<th>Roles</th>
+		<th><?php _e( 'Roles', MDMR_TXTDOMAIN ); ?></th>
 		<td>
 			<?php foreach( $roles as $name => $label ) : ?>
 				<label for="md-multiple-roles-<?php echo $name; ?>">
diff --git a/views/column.html.php b/views/column.html.php
index bac54ea..173c435 100644
--- a/views/column.html.php
+++ b/views/column.html.php
@@ -11,6 +11,6 @@
 		endforeach;
 		echo implode( ', ', $roles );
 	else : ?>
-		<span class="md-multiple-roles-no-role">None</span>
+		<span class="md-multiple-roles-no-role"><?php _e( 'None', MDMR_TXTDOMAIN ); ?></span>
 	<?php endif; ?>
 </div><!-- .md-multiple-roles -->
\ No newline at end of file

From 9941488d2247cf8c74a9f7cedc9f139e3f491316 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Mon, 26 Sep 2016 14:11:00 +0200
Subject: [PATCH 05/50] Update changelog

---
 readme.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.txt b/readme.txt
index c7a8a3a..d0782f6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -60,6 +60,7 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 = 1.1 =
 * Add support of role checkbox in new user form (admin).
+* Add i18n support (text domain, translatable strings and pot file)
 
 = 1.0 =
 * Initial release.
\ No newline at end of file

From 169f29b35300866b689fcb55ceeeb5050bf96d1a Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Thu, 6 Oct 2016 21:31:10 +0200
Subject: [PATCH 06/50] Remove textdomain from constant

---
 controllers/column.php   | 2 +-
 multiple-roles.php       | 3 +--
 views/checklist.html.php | 4 ++--
 views/column.html.php    | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/controllers/column.php b/controllers/column.php
index 832941b..20ae4f5 100644
--- a/controllers/column.php
+++ b/controllers/column.php
@@ -29,7 +29,7 @@ public function __construct( $model ) {
 	 */
 	public function replace_column( $columns ) {
 		unset( $columns['role'] );
-		$columns['md_multiple_roles_column'] = __( 'Roles', MDMR_TXTDOMAIN );
+		$columns['md_multiple_roles_column'] = __( 'Roles', 'multiple-roles' );
 		return $columns;
 	}
 
diff --git a/multiple-roles.php b/multiple-roles.php
index 4ee0206..d8e9cb0 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -10,7 +10,6 @@
 
 define( 'MDMR_PATH', plugin_dir_path( __FILE__ ) );
 define( 'MDMR_URL', plugin_dir_url( __FILE__ ) );
-define( 'MDMR_TXTDOMAIN', 'multiple-roles' );
 
 /**
  * Load files and add hooks to get things rolling.
@@ -36,7 +35,7 @@ function md_multiple_roles() {
 	add_filter( 'manage_users_custom_column', array( $column, 'output_column_content' ), 10, 3 );
 
     add_action( 'init', function() {
-        load_plugin_textdomain( MDMR_TXTDOMAIN, false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+        load_plugin_textdomain( 'multiple-roles', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
     } );
 }
 
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 889038e..4d91e7c 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -5,10 +5,10 @@
  * @var $roles array All WordPress roles in name => label pairs.
  * @var $user_roles array An array of role names belonging to the current user.
  */
-?><h3><?php _e( 'Permissions', MDMR_TXTDOMAIN ); ?></h3>
+?><h3><?php _e( 'Permissions', 'multiple-roles' ); ?></h3>
 <table class="form-table">
 	<tr>
-		<th><?php _e( 'Roles', MDMR_TXTDOMAIN ); ?></th>
+		<th><?php _e( 'Roles', 'multiple-roles' ); ?></th>
 		<td>
 			<?php foreach( $roles as $name => $label ) : ?>
 				<label for="md-multiple-roles-<?php echo $name; ?>">
diff --git a/views/column.html.php b/views/column.html.php
index 173c435..fa8e7e3 100644
--- a/views/column.html.php
+++ b/views/column.html.php
@@ -11,6 +11,6 @@
 		endforeach;
 		echo implode( ', ', $roles );
 	else : ?>
-		<span class="md-multiple-roles-no-role"><?php _e( 'None', MDMR_TXTDOMAIN ); ?></span>
+		<span class="md-multiple-roles-no-role"><?php _e( 'None', 'multiple-roles' ); ?></span>
 	<?php endif; ?>
 </div><!-- .md-multiple-roles -->
\ No newline at end of file

From 2768c68bf499f4b70eab358d502b87556e6150af Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Thu, 6 Oct 2016 22:06:14 +0200
Subject: [PATCH 07/50] Security : Sanitize, escape

Coding standards

Code refactoring
---
 controllers/checklist.php | 27 ++++++++++++++++-------
 controllers/column.php    |  3 ++-
 model.php                 | 46 ++++++++++++++++++++++++++++++---------
 views/checklist.html.php  |  8 +++----
 views/column.html.php     |  4 ++--
 5 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 9ed8cb3..308e813 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -27,8 +27,9 @@ public function __construct( $model ) {
 	 * @param string $hook The current admin screen.
 	 */
 	public function remove_dropdown( $hook ) {
-		if ( $hook != 'user-edit.php' && $hook != 'user-new.php' )
+		if ( 'user-edit.php' !== $hook && 'user-new.php' !== $hook) {
 			return;
+		}
 		wp_enqueue_script( 'md-multiple-roles', MDMR_URL . 'views/js/scripts.js', array( 'jquery' ) );
 	}
 
@@ -40,8 +41,9 @@ public function remove_dropdown( $hook ) {
 	 */
 	public function output_checklist( $user ) {
 
-		if ( !$this->model->can_update_roles() )
+		if ( ! $this->model->can_update_roles() ) {
 			return;
+		}
 
 		wp_nonce_field( 'update-md-multiple-roles', 'md_multiple_roles_nonce' );
 
@@ -60,16 +62,25 @@ public function output_checklist( $user ) {
 	 */
 	public function process_checklist( $user_id ) {
 
-		if ( isset( $_POST['md_multiple_roles_nonce'] ) && !wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) )
-			return;
+		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
+			return false;
+		}
 
-		if ( !$this->model->can_update_roles() )
-			return;
+		if ( ! $this->model->can_update_roles() ) {
+			return false;
+		}
 
-		$new_roles = isset( $_POST['md_multiple_roles'] ) ? $_POST['md_multiple_roles'] : array();
+		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
+		if ( empty( $new_roles ) ) {
+			return false;
+		}
 
-		$this->model->update_roles( $user_id, $new_roles );
+		$updated_roles_check = $this->model->update_roles( $user_id, $new_roles );
+		if ( false === $updated_roles_check ) {
+			return false;
+		}
 
+		return true;
 	}
 
 }
\ No newline at end of file
diff --git a/controllers/column.php b/controllers/column.php
index 20ae4f5..c2c2f93 100644
--- a/controllers/column.php
+++ b/controllers/column.php
@@ -43,8 +43,9 @@ public function replace_column( $columns ) {
 	 */
 	public function output_column_content( $output, $column, $user_id ) {
 
-		if ( $column !== 'md_multiple_roles_column' )
+		if ( 'md_multiple_roles_column' !== $column ) {
 			return $output;
+		}
 
 		$roles = $this->model->get_user_roles( $user_id );
 
diff --git a/model.php b/model.php
index 6a6b03c..6dd8b01 100644
--- a/model.php
+++ b/model.php
@@ -14,6 +14,21 @@ public function get_roles() {
 		return $wp_roles->role_names;
 	}
 
+	public function is_role_exists( $user_role = '' ) {
+		if ( empty( $user_role ) ) {
+			return false;
+		}
+
+		$roles = $this->get_roles();
+		foreach ( $roles as $role ) {
+			if ( $user_role === $role ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Grab a particular user's roles.
 	 *
@@ -22,21 +37,22 @@ public function get_roles() {
 	 */
 	public function get_user_roles( $user = 0 ) {
 
-		if ( $user && is_int( $user ) )
-			$user = get_user_by( 'id', $user );
+		if ( ! $user ) {
+			return array();
+		}
 
-		if ( !$user )
+		$user = get_user_by( 'id', (int) $user );
+		if ( empty( $user->roles ) ) {
 			return array();
+		}
 
-		global $wp_roles;
+		$all_roles = $this->get_roles();
 		$roles = array();
-
 		foreach( $user->roles as $role ) {
-			$roles[$role] = $wp_roles->role_names[$role];
+			$roles[$role] = $all_roles[$role];
 		}
 
 		return $roles;
-
 	}
 
 	/**
@@ -44,11 +60,19 @@ public function get_user_roles( $user = 0 ) {
 	 *
 	 * @param integer $user_id The WordPress user ID.
 	 * @param array $roles The new array of roles for the user.
+	 *
+	 * @return bool
 	 */
 	public function update_roles( $user_id = 0, $roles = array() ) {
 
+		if ( empty( $roles ) ) {
+			return false;
+		}
+
 		$roles = array_map( 'sanitize_key', (array) $roles );
-		$user = get_user_by( 'id', $user_id );
+		$roles = array_filter( $roles, array( $this, 'is_role_exists' ) );
+
+		$user = get_user_by( 'id', (int) $user_id );
 
 		// remove all roles
 		$user->set_role( '' );
@@ -57,6 +81,7 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 			$user->add_role( $role );
 		}
 
+		return true;
 	}
 
 	/**
@@ -69,9 +94,10 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 	public function can_update_roles() {
 
 		if ( is_network_admin()
-	      || !current_user_can( 'edit_users' )
-		  || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && !current_user_can( 'manage_sites' ) ) )
+	      || ! current_user_can( 'edit_users' )
+		  || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
 			return false;
+		}
 
 		return true;
 
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 4d91e7c..250fc6d 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -11,17 +11,17 @@
 		<th><?php _e( 'Roles', 'multiple-roles' ); ?></th>
 		<td>
 			<?php foreach( $roles as $name => $label ) : ?>
-				<label for="md-multiple-roles-<?php echo $name; ?>">
+				<label for="md-multiple-roles-<?php echo esc_attr( $name ); ?>">
 					<input
-						id="md-multiple-roles-<?php echo $name; ?>"
+						id="md-multiple-roles-<?php echo esc_attr( $name ); ?>"
 						type="checkbox"
 						name="md_multiple_roles[]"
-						value="<?php echo $name; ?>"
+						value="<?php echo esc_attr( $name ); ?>"
                         <?php if ( ! is_null( $user_roles ) ) :
                             checked( in_array( $name, $user_roles ) );
                         endif; ?>
 					/>
-					<?php echo $label; ?>
+					<?php echo esc_html( $label ); ?>
 				</label>
 				<br />
 			<?php endforeach; ?>
diff --git a/views/column.html.php b/views/column.html.php
index fa8e7e3..950483f 100644
--- a/views/column.html.php
+++ b/views/column.html.php
@@ -5,9 +5,9 @@
  * @var $roles array All applicable roles in name => label pairs.
  */
 ?><div class="md-multiple-roles">
-	<?php if ( $roles ) :
+	<?php if ( ! empty( $roles ) ) :
 		foreach( $roles as $name => $label ) :
-			$roles[$name] = '<a href="users.php?role=' . $name . '">' . $label . '</a>';
+			$roles[$name] = '<a href="users.php?role=' . esc_attr( $name ) . '">' . esc_html( $label ) . '</a>';
 		endforeach;
 		echo implode( ', ', $roles );
 	else : ?>

From cf2d37e8faafa5585718c7f507e7307da95f13c7 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Fri, 7 Oct 2016 19:29:45 +0200
Subject: [PATCH 08/50] Enhance form with better UX; Avoid conflicts

---
 views/checklist.html.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/views/checklist.html.php b/views/checklist.html.php
index 250fc6d..5a04e55 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -5,20 +5,26 @@
  * @var $roles array All WordPress roles in name => label pairs.
  * @var $user_roles array An array of role names belonging to the current user.
  */
-?><h3><?php _e( 'Permissions', 'multiple-roles' ); ?></h3>
+$creating = isset( $_POST['createuser'] );
+$selected_roles = $creating && isset( $_POST['md_multiple_roles'] ) ? wp_unslash( $_POST['md_multiple_roles'] ) : '';
+?>
+<h3><?php _e( 'Permissions', 'multiple-roles' ); ?></h3>
 <table class="form-table">
 	<tr>
 		<th><?php _e( 'Roles', 'multiple-roles' ); ?></th>
 		<td>
-			<?php foreach( $roles as $name => $label ) : ?>
-				<label for="md-multiple-roles-<?php echo esc_attr( $name ); ?>">
+			<?php foreach( $roles as $name => $label ) :
+				$input_uniq_id = uniqid(); ?>
+				<label for="md-multiple-roles-<?php echo esc_attr( $name ) . '-' . $input_uniq_id; ?>">
 					<input
-						id="md-multiple-roles-<?php echo esc_attr( $name ); ?>"
+						id="md-multiple-roles-<?php echo esc_attr( $name ) . '-' . $input_uniq_id; ?>"
 						type="checkbox"
 						name="md_multiple_roles[]"
 						value="<?php echo esc_attr( $name ); ?>"
-                        <?php if ( ! is_null( $user_roles ) ) :
+                        <?php if ( ! is_null( $user_roles ) ) : // Edit user page
                             checked( in_array( $name, $user_roles ) );
+						elseif ( ! empty( $selected_roles ) ) : // Add new user page
+							checked( in_array( $name, $selected_roles ) );
                         endif; ?>
 					/>
 					<?php echo esc_html( $label ); ?>

From 6b06b4c14b7752f6910719c8e5d7f9698bec4cec Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Fri, 7 Oct 2016 20:06:13 +0200
Subject: [PATCH 09/50] rever is user role

---
 controllers/checklist.php | 14 ++++----------
 model.php                 | 16 ----------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 308e813..fc778bc 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -61,26 +61,20 @@ public function output_checklist( $user ) {
 	 * @param int $user_id The user ID whose roles might get updated.
 	 */
 	public function process_checklist( $user_id ) {
-
 		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
-			return false;
+			return;
 		}
 
 		if ( ! $this->model->can_update_roles() ) {
-			return false;
+			return;
 		}
 
 		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
 		if ( empty( $new_roles ) ) {
-			return false;
-		}
-
-		$updated_roles_check = $this->model->update_roles( $user_id, $new_roles );
-		if ( false === $updated_roles_check ) {
-			return false;
+			return;
 		}
 
-		return true;
+		$this->model->update_roles( $user_id, $new_roles );
 	}
 
 }
\ No newline at end of file
diff --git a/model.php b/model.php
index 6dd8b01..1cc30ee 100644
--- a/model.php
+++ b/model.php
@@ -14,21 +14,6 @@ public function get_roles() {
 		return $wp_roles->role_names;
 	}
 
-	public function is_role_exists( $user_role = '' ) {
-		if ( empty( $user_role ) ) {
-			return false;
-		}
-
-		$roles = $this->get_roles();
-		foreach ( $roles as $role ) {
-			if ( $user_role === $role ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	/**
 	 * Grab a particular user's roles.
 	 *
@@ -70,7 +55,6 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 		}
 
 		$roles = array_map( 'sanitize_key', (array) $roles );
-		$roles = array_filter( $roles, array( $this, 'is_role_exists' ) );
 
 		$user = get_user_by( 'id', (int) $user_id );
 

From 14ebab5e794bfb0fd87efbf1e1645da83545060a Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sun, 9 Oct 2016 19:22:31 +0200
Subject: [PATCH 10/50] Check if role exist before updating

---
 model.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/model.php b/model.php
index 1cc30ee..f8b1611 100644
--- a/model.php
+++ b/model.php
@@ -55,6 +55,7 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 		}
 
 		$roles = array_map( 'sanitize_key', (array) $roles );
+		$roles = array_filter( (array) $roles, 'get_role' );
 
 		$user = get_user_by( 'id', (int) $user_id );
 
@@ -78,8 +79,8 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 	public function can_update_roles() {
 
 		if ( is_network_admin()
-	      || ! current_user_can( 'edit_users' )
-		  || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
+			|| ! current_user_can( 'edit_users' )
+			|| ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
 			return false;
 		}
 

From f4c68b2b4902aae9ff1015a3c5d0833c906f5961 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Tue, 11 Oct 2016 11:10:20 +0200
Subject: [PATCH 11/50] Properly handle multisite add new user

---
 multiple-roles.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index d8e9cb0..2cca395 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -28,7 +28,13 @@ function md_multiple_roles() {
 	add_action( 'edit_user_profile',     array( $checklist, 'output_checklist' ) );
 	add_action( 'user_new_form',         array( $checklist, 'output_checklist' ) );
 	add_action( 'profile_update',        array( $checklist, 'process_checklist' ) );
-	add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
+
+	// In multisite, user_register hook is too early so wp_mu_activate_user add user role after
+	if ( is_multisite() ) {
+		add_action( 'wpmu_activate_user',    array( $checklist, 'process_checklist' ) ); // Handle Multisite
+	} else {
+		add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
+	}
 
 	$column = new MDMR_Column_Controller( $model );
 	add_filter( 'manage_users_columns',       array( $column, 'replace_column' ), 11 );

From e0c045481dc722d03c417805008023f4a0e7c8f5 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Tue, 11 Oct 2016 11:32:22 +0200
Subject: [PATCH 12/50] get_editable_roles to be sure a little user role can
 add admin user

---
 controllers/checklist.php | 2 +-
 controllers/column.php    | 2 +-
 model.php                 | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index fc778bc..2fd7105 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -8,7 +8,7 @@ class MDMR_Checklist_Controller {
 	/**
 	 * The model object.
 	 *
-	 * @var object
+	 * @var \MDMR_Model $model
 	 */
 	var $model;
 
diff --git a/controllers/column.php b/controllers/column.php
index c2c2f93..11b357f 100644
--- a/controllers/column.php
+++ b/controllers/column.php
@@ -8,7 +8,7 @@ class MDMR_Column_Controller {
 	/**
 	 * The model object.
 	 *
-	 * @var object
+	 * @var \MDMR_Model $model
 	 */
 	var $model;
 
diff --git a/model.php b/model.php
index f8b1611..6865009 100644
--- a/model.php
+++ b/model.php
@@ -10,8 +10,7 @@ class MDMR_Model {
 	 * @return array Roles in name => label pairs.
 	 */
 	public function get_roles() {
-		global $wp_roles;
-		return $wp_roles->role_names;
+		return get_editable_roles();
 	}
 
 	/**
@@ -78,10 +77,8 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 	 */
 	public function can_update_roles() {
 
-		if ( is_network_admin()
-			|| ! current_user_can( 'edit_users' )
-			|| ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
-			return false;
+		if ( is_network_admin() || ! current_user_can( 'edit_users' ) || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
+				return false;
 		}
 
 		return true;

From 9c9ba9b982aee55331eb8b805d3342cb8d08c27e Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Tue, 11 Oct 2016 13:29:21 +0200
Subject: [PATCH 13/50] Add some filters

---
 controllers/checklist.php |  5 ++++-
 model.php                 | 24 +++++++++++++++++++++++-
 multiple-roles.php        |  1 +
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 2fd7105..e817c59 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -47,7 +47,7 @@ public function output_checklist( $user ) {
 
 		wp_nonce_field( 'update-md-multiple-roles', 'md_multiple_roles_nonce' );
 
-		$roles        = $this->model->get_roles();
+		$roles        = $this->model->get_editable_roles();
         $user_roles   = ( isset( $user->roles ) ) ? $user->roles : null;
 
 		include( MDMR_PATH . 'views/checklist.html.php' );
@@ -61,6 +61,9 @@ public function output_checklist( $user ) {
 	 * @param int $user_id The user ID whose roles might get updated.
 	 */
 	public function process_checklist( $user_id ) {
+
+		do_action( 'mdmr/before_process_checklist', $user_id, $_POST['md_multiple_roles_nonce'] );
+
 		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
 		}
diff --git a/model.php b/model.php
index 6865009..7708ab2 100644
--- a/model.php
+++ b/model.php
@@ -10,7 +10,23 @@ class MDMR_Model {
 	 * @return array Roles in name => label pairs.
 	 */
 	public function get_roles() {
-		return get_editable_roles();
+		global $wp_roles;
+		return apply_filters( 'mdmr/get_roles', $wp_roles->role_names );
+	}
+
+	/**
+	 * Get all editable roles by the current user
+	 *
+	 * @return array editable roles
+	 */
+	public function get_editable_roles() {
+		$editable_roles = get_editable_roles();
+		$final_roles = array();
+		foreach ( $editable_roles as $key => $role ) {
+			$final_roles[$key] = $role['name'];
+		}
+
+		return apply_filters( 'mdmr/get_editable_roles', (array) $final_roles );
 	}
 
 	/**
@@ -49,6 +65,8 @@ public function get_user_roles( $user = 0 ) {
 	 */
 	public function update_roles( $user_id = 0, $roles = array() ) {
 
+		do_action( 'mdmr/before_update_roles', $user_id, $roles );
+
 		if ( empty( $roles ) ) {
 			return false;
 		}
@@ -65,6 +83,8 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 			$user->add_role( $role );
 		}
 
+		do_action( 'mdmr/after_update_roles', $user_id, $roles, $user->roles );
+
 		return true;
 	}
 
@@ -77,6 +97,8 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 	 */
 	public function can_update_roles() {
 
+		do_action( 'mdmr/before_can_update_roles' );
+
 		if ( is_network_admin() || ! current_user_can( 'edit_users' ) || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
 				return false;
 		}
diff --git a/multiple-roles.php b/multiple-roles.php
index 2cca395..f7d33f7 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -29,6 +29,7 @@ function md_multiple_roles() {
 	add_action( 'user_new_form',         array( $checklist, 'output_checklist' ) );
 	add_action( 'profile_update',        array( $checklist, 'process_checklist' ) );
 
+	// For new user form (in Backoffice)
 	// In multisite, user_register hook is too early so wp_mu_activate_user add user role after
 	if ( is_multisite() ) {
 		add_action( 'wpmu_activate_user',    array( $checklist, 'process_checklist' ) ); // Handle Multisite

From dbd41c15106fff4d1ac9a56e9773491fe748c035 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Tue, 11 Oct 2016 13:40:24 +0200
Subject: [PATCH 14/50] Update readme changelog

---
 multiple-roles.php | 4 +++-
 readme.txt         | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index f7d33f7..2e78a92 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -4,7 +4,9 @@
 Description: Allow users to have multiple roles on one site.
 Version: 1.1
 Author: Michael Dance, Florian Tiar
-Author URI: http://mikedance.com
+Author URI: http://tiar-florian.fr
+Plugin URI: https://wordpress.org/plugins/multiple-roles/
+Github URI: https://github.com/Mahjouba91/multiple-roles
 Text Domain: multiple-roles
 */
 
diff --git a/readme.txt b/readme.txt
index d0782f6..bb8a358 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,9 @@
 Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
-Tested up to: 4.2.1
+Tested up to: 4.6.1
 Stable tag: 1.1
+Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -61,6 +62,11 @@ Sure. The user will still be able to log in and out, but won't be able to access
 = 1.1 =
 * Add support of role checkbox in new user form (admin).
 * Add i18n support (text domain, translatable strings and pot file)
+* Add Multisite support
+* Add some hooks (actions and filters)
+* Fix issue where some users role (like editor) could add admin users
+* Sanitize and escape all data
+* Enhance UX of the form
 
 = 1.0 =
 * Initial release.
\ No newline at end of file

From d4037f5753d83d9f840995dfd28c9fbda514a4f3 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Tue, 11 Oct 2016 14:23:21 +0200
Subject: [PATCH 15/50] Update readme

---
 readme.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index bb8a358..823c7a1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -14,8 +14,9 @@ Allow users to have multiple roles on one site.
 
 This plugin allows you to select multiple roles for a user - something that WordPress already supports "under the hood", but doesn't provide a user interface for.
 
-User edit screens will display a checklist of roles instead of the default role dropdown. The main user list screen will also display all roles a user has.
+User edit and Add new user screens will display a checklist of roles instead of the default role dropdown. The main user list screen will also display all roles a user has.
 
+It supports well Multisite mode
 That's it. No extra settings. This plugin is a good complement to other user plugins that don't support multiple roles, such as <a href="https://wordpress.org/plugins/members/">Members</a>.
 
 == Installation ==

From 4a30fb8e27a8e41e574f1ffbad243223304f9540 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sun, 23 Oct 2016 19:22:46 +0200
Subject: [PATCH 16/50] Update readme

---
 multiple-roles.php |  2 +-
 readme.txt         | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index 2e78a92..50eb2ce 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -3,7 +3,7 @@
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
 Version: 1.1
-Author: Michael Dance, Florian Tiar
+Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
 Github URI: https://github.com/Mahjouba91/multiple-roles
diff --git a/readme.txt b/readme.txt
index 823c7a1..5934e5e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -16,8 +16,11 @@ This plugin allows you to select multiple roles for a user - something that Word
 
 User edit and Add new user screens will display a checklist of roles instead of the default role dropdown. The main user list screen will also display all roles a user has.
 
-It supports well Multisite mode
-That's it. No extra settings. This plugin is a good complement to other user plugins that don't support multiple roles, such as <a href="https://wordpress.org/plugins/members/">Members</a>.
+It also supports well Multisite mode.
+
+That's it. No extra settings.
+
+If you want to contribute to this plugin, feel free to check the Github repository : https://github.com/Mahjouba91/multiple-roles
 
 == Installation ==
 
@@ -39,11 +42,11 @@ That's it. No extra settings. This plugin is a good complement to other user plu
 
 = Who can edit users roles? =
 
-Anyone with the `edit_users` capability. By default, that means only administrators and, on multi-site networks, super admins.
+Anyone with the `edit_users` capability. By default, that means only administrators and network administrators on multi-site.
 
 = Can you edit your own roles? =
 
-If you're a network admin on a multi-site setup, yes, you can edit your roles in sites on that network. Otherwise, no. This is how WordPress works normally too.
+If you're a network administrator on a multi-site setup, yes, you can edit your roles in sites of that network. Otherwise, no. This is how WordPress works normally too.
 
 = I'm on the user edit screen - where's the checklist of roles? =
 
@@ -61,13 +64,14 @@ Sure. The user will still be able to log in and out, but won't be able to access
 == Changelog ==
 
 = 1.1 =
-* Add support of role checkbox in new user form (admin).
+* New maintainer : Florian TIAR, you're strongly encouraged to update this plugin
+* Add support of role checkbox in new user form (admin)
+* Add Multisite support (for new user form)
 * Add i18n support (text domain, translatable strings and pot file)
-* Add Multisite support
 * Add some hooks (actions and filters)
-* Fix issue where some users role (like editor) could add admin users
+* Fix issue where some low level users could add admin users
 * Sanitize and escape all data
 * Enhance UX of the form
 
 = 1.0 =
-* Initial release.
\ No newline at end of file
+* Initial release
\ No newline at end of file

From e8e856568daa241dbce23e2eb130f453270b8f16 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sun, 23 Oct 2016 19:24:38 +0200
Subject: [PATCH 17/50] Update gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 180cb14..aa454e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@
 .htaccess
 
 # PHP Storm files
-.idea
\ No newline at end of file
+.idea
+
+release.sh
\ No newline at end of file

From 61ca8b12c7f1bf56288cca443e5eea54ba3c84be Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sun, 23 Oct 2016 19:36:20 +0200
Subject: [PATCH 18/50] Add Human made hooks

---
 controllers/checklist.php | 2 +-
 controllers/column.php    | 2 +-
 model.php                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index e817c59..ce6935b 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -50,7 +50,7 @@ public function output_checklist( $user ) {
 		$roles        = $this->model->get_editable_roles();
         $user_roles   = ( isset( $user->roles ) ) ? $user->roles : null;
 
-		include( MDMR_PATH . 'views/checklist.html.php' );
+		include( apply_filters( 'mdmr_checklist_template', MDMR_PATH . 'views/checklist.html.php' ) );
 
 	}
 
diff --git a/controllers/column.php b/controllers/column.php
index 11b357f..ab00160 100644
--- a/controllers/column.php
+++ b/controllers/column.php
@@ -50,7 +50,7 @@ public function output_column_content( $output, $column, $user_id ) {
 		$roles = $this->model->get_user_roles( $user_id );
 
 		ob_start();
-		include( MDMR_PATH . 'views/column.html.php' );
+		include( apply_filters( 'mdmr_column_template', MDMR_PATH . 'views/column.html.php' ) );
 		return ob_get_clean();
 
 	}
diff --git a/model.php b/model.php
index 7708ab2..b128349 100644
--- a/model.php
+++ b/model.php
@@ -11,7 +11,7 @@ class MDMR_Model {
 	 */
 	public function get_roles() {
 		global $wp_roles;
-		return apply_filters( 'mdmr/get_roles', $wp_roles->role_names );
+		return apply_filters( 'mdmr_get_roles', $wp_roles->role_names );
 	}
 
 	/**
@@ -52,7 +52,7 @@ public function get_user_roles( $user = 0 ) {
 			$roles[$role] = $all_roles[$role];
 		}
 
-		return $roles;
+		return apply_filters( 'mdmr_get_user_roles', $roles );
 	}
 
 	/**

From c3b4a8a01dd19a257a7b26b75d2e874d4a407e33 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sun, 23 Oct 2016 19:39:09 +0200
Subject: [PATCH 19/50] Better consisten with hook names

---
 controllers/checklist.php | 2 +-
 model.php                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index ce6935b..61c109a 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -62,7 +62,7 @@ public function output_checklist( $user ) {
 	 */
 	public function process_checklist( $user_id ) {
 
-		do_action( 'mdmr/before_process_checklist', $user_id, $_POST['md_multiple_roles_nonce'] );
+		do_action( 'mdmr_before_process_checklist', $user_id, $_POST['md_multiple_roles_nonce'] );
 
 		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
diff --git a/model.php b/model.php
index b128349..fb8a40c 100644
--- a/model.php
+++ b/model.php
@@ -26,7 +26,7 @@ public function get_editable_roles() {
 			$final_roles[$key] = $role['name'];
 		}
 
-		return apply_filters( 'mdmr/get_editable_roles', (array) $final_roles );
+		return apply_filters( 'mdmr_get_editable_roles', (array) $final_roles );
 	}
 
 	/**
@@ -65,7 +65,7 @@ public function get_user_roles( $user = 0 ) {
 	 */
 	public function update_roles( $user_id = 0, $roles = array() ) {
 
-		do_action( 'mdmr/before_update_roles', $user_id, $roles );
+		do_action( 'mdmr_before_update_roles', $user_id, $roles );
 
 		if ( empty( $roles ) ) {
 			return false;
@@ -83,7 +83,7 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 			$user->add_role( $role );
 		}
 
-		do_action( 'mdmr/after_update_roles', $user_id, $roles, $user->roles );
+		do_action( 'mdmr_after_update_roles', $user_id, $roles, $user->roles );
 
 		return true;
 	}
@@ -97,7 +97,7 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 	 */
 	public function can_update_roles() {
 
-		do_action( 'mdmr/before_can_update_roles' );
+		do_action( 'mdmr_before_can_update_roles' );
 
 		if ( is_network_admin() || ! current_user_can( 'edit_users' ) || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
 				return false;

From cbbebd178a82e967a804149cddd334e638d57f9f Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Sun, 23 Oct 2016 19:40:04 +0200
Subject: [PATCH 20/50] Add version of JS script

---
 controllers/checklist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 61c109a..d0c7753 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -30,7 +30,7 @@ public function remove_dropdown( $hook ) {
 		if ( 'user-edit.php' !== $hook && 'user-new.php' !== $hook) {
 			return;
 		}
-		wp_enqueue_script( 'md-multiple-roles', MDMR_URL . 'views/js/scripts.js', array( 'jquery' ) );
+		wp_enqueue_script( 'md-multiple-roles', MDMR_URL . 'views/js/scripts.js', array( 'jquery' ), '1.0' );
 	}
 
 	/**

From d7dca7d8e3e79c3a65fcfdb23b2c3609955a67e2 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 2 Nov 2016 22:17:16 +0100
Subject: [PATCH 21/50] Remove closure to ensure BC with PHP < 5.3

---
 multiple-roles.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index 50eb2ce..ae01338 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -43,9 +43,11 @@ function md_multiple_roles() {
 	add_filter( 'manage_users_columns',       array( $column, 'replace_column' ), 11 );
 	add_filter( 'manage_users_custom_column', array( $column, 'output_column_content' ), 10, 3 );
 
-    add_action( 'init', function() {
-        load_plugin_textdomain( 'multiple-roles', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
-    } );
+    add_action( 'init', 'load_translation' );
 }
 
-md_multiple_roles();
\ No newline at end of file
+md_multiple_roles();
+
+function load_translation() {
+	load_plugin_textdomain( 'multiple-roles', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+}
\ No newline at end of file

From 36bf33298bfd31b14d853fcb52ae80336306ee1f Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 2 Nov 2016 22:41:38 +0100
Subject: [PATCH 22/50] Code refactoring, update changelog

---
 multiple-roles.php | 56 +++++++++++++++++++++-------------------------
 readme.txt         |  5 ++++-
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index ae01338..7adc072 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.1
+Version: 1.1.1
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
@@ -16,38 +16,32 @@
 /**
  * Load files and add hooks to get things rolling.
  */
-function md_multiple_roles() {
-
-	require_once( MDMR_PATH . 'model.php' );
-	require_once( MDMR_PATH . 'controllers/checklist.php' );
-	require_once( MDMR_PATH . 'controllers/column.php' );
-
-	$model = new MDMR_Model();
-
-	$checklist = new MDMR_Checklist_Controller( $model );
-	add_action( 'admin_enqueue_scripts', array( $checklist, 'remove_dropdown' ) );
-	add_action( 'show_user_profile',     array( $checklist, 'output_checklist' ) );
-	add_action( 'edit_user_profile',     array( $checklist, 'output_checklist' ) );
-	add_action( 'user_new_form',         array( $checklist, 'output_checklist' ) );
-	add_action( 'profile_update',        array( $checklist, 'process_checklist' ) );
-
-	// For new user form (in Backoffice)
-	// In multisite, user_register hook is too early so wp_mu_activate_user add user role after
-	if ( is_multisite() ) {
-		add_action( 'wpmu_activate_user',    array( $checklist, 'process_checklist' ) ); // Handle Multisite
-	} else {
-		add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
-	}
-
-	$column = new MDMR_Column_Controller( $model );
-	add_filter( 'manage_users_columns',       array( $column, 'replace_column' ), 11 );
-	add_filter( 'manage_users_custom_column', array( $column, 'output_column_content' ), 10, 3 );
-
-    add_action( 'init', 'load_translation' );
+require_once( MDMR_PATH . 'model.php' );
+require_once( MDMR_PATH . 'controllers/checklist.php' );
+require_once( MDMR_PATH . 'controllers/column.php' );
+
+$model = new MDMR_Model();
+
+$checklist = new MDMR_Checklist_Controller( $model );
+add_action( 'admin_enqueue_scripts', array( $checklist, 'remove_dropdown' ) );
+add_action( 'show_user_profile',     array( $checklist, 'output_checklist' ) );
+add_action( 'edit_user_profile',     array( $checklist, 'output_checklist' ) );
+add_action( 'user_new_form',         array( $checklist, 'output_checklist' ) );
+add_action( 'profile_update',        array( $checklist, 'process_checklist' ) );
+
+// For new user form (in Backoffice)
+// In multisite, user_register hook is too early so wp_mu_activate_user add user role after
+if ( is_multisite() ) {
+	add_action( 'wpmu_activate_user',    array( $checklist, 'process_checklist' ) ); // Handle Multisite
+} else {
+	add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
 }
 
-md_multiple_roles();
+$column = new MDMR_Column_Controller( $model );
+add_filter( 'manage_users_columns',       array( $column, 'replace_column' ), 11 );
+add_filter( 'manage_users_custom_column', array( $column, 'output_column_content' ), 10, 3 );
 
+add_action( 'init', 'load_translation' );
 function load_translation() {
 	load_plugin_textdomain( 'multiple-roles', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
-}
\ No newline at end of file
+}
diff --git a/readme.txt b/readme.txt
index 5934e5e..ec8ca5f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
 Tested up to: 4.6.1
-Stable tag: 1.1
+Stable tag: 1.1.1
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63,6 +63,9 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.1.1 =
+* Remove PHP closure to ensure Backward Compatibility with PHP versions < 5.3
+
 = 1.1 =
 * New maintainer : Florian TIAR, you're strongly encouraged to update this plugin
 * Add support of role checkbox in new user form (admin)

From 19e340c0ad3aecfcd67601d14b0c0d7f21cf1e4c Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 21 Dec 2016 01:07:22 +0100
Subject: [PATCH 23/50] Fix multisite bug with subsciption 1.1.2

---
 controllers/checklist.php | 57 ++++++++++++++++++++++++++++++++++++---
 model.php                 |  2 +-
 multiple-roles.php        |  5 +++-
 readme.txt                | 11 ++++++--
 views/checklist.html.php  |  4 +--
 5 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index d0c7753..bff1e12 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -62,7 +62,7 @@ public function output_checklist( $user ) {
 	 */
 	public function process_checklist( $user_id ) {
 
-		do_action( 'mdmr_before_process_checklist', $user_id, $_POST['md_multiple_roles_nonce'] );
+		do_action( 'mdmr_before_process_checklist', $user_id, $_POST['role'] );
 
 		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
@@ -72,12 +72,61 @@ public function process_checklist( $user_id ) {
 			return;
 		}
 
-		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
-		if ( empty( $new_roles ) ) {
+		$roles = ( isset( $_POST['role'] ) && is_array( $_POST['role'] ) ) ? $_POST['role'] : array();
+		if ( empty( $roles ) ) {
 			return;
 		}
 
-		$this->model->update_roles( $user_id, $new_roles );
+		$this->model->update_roles( $user_id, $roles );
+	}
+
+//	/**
+//	 * Add multiple roles in meta array on multisite signups database table
+//	 *
+//	 * @param $meta
+//	 * @param $user
+//	 * @param $user_email
+//	 * @param $key
+//	 *
+//	 * @return mixed
+//	 */
+//	public function mu_add_roles_in_signup( $meta, $user, $user_email, $key ) {
+//
+//		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
+//			return $meta;
+//		}
+//
+//		if ( ! $this->model->can_update_roles() ) {
+//			return $meta;
+//		}
+//
+//		$roles = ( isset( $_POST['role'] ) && is_array( $_POST['role'] ) ) ? $_POST['role'] : array();
+//		if ( ! empty( $roles ) ) {
+//			$meta['role'] = $roles;
+//		}
+//
+//		return $meta;
+//	}
+
+	/**
+	 * Add multiple roles after user activation
+	 *
+	 * @param $user_id
+	 * @param $password
+	 * @param $meta
+	 */
+	public function mu_add_roles_after_activation( $user_id, $password, $meta ) {
+		if ( ! empty( $meta['add_to_blog'] ) ) {
+			$blog_id = $meta['add_to_blog'];
+			remove_user_from_blog( $user_id, get_network()->site_id ); // remove user from main blog.
+			add_user_to_blog( $blog_id, $user_id, '' );
+			update_user_meta( $user_id, 'primary_blog', $blog_id );
+		}
+
+		if ( ! empty( $meta['new_role'] ) ) {
+			$user = get_user_by( 'id', (int) $user_id );
+			$this->model->update_roles( $user_id, $meta['new_role'] );
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/model.php b/model.php
index fb8a40c..1907365 100644
--- a/model.php
+++ b/model.php
@@ -100,7 +100,7 @@ public function can_update_roles() {
 		do_action( 'mdmr_before_can_update_roles' );
 
 		if ( is_network_admin() || ! current_user_can( 'edit_users' ) || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
-				return false;
+			return false;
 		}
 
 		return true;
diff --git a/multiple-roles.php b/multiple-roles.php
index 7adc072..8b3a926 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -32,7 +32,10 @@
 // For new user form (in Backoffice)
 // In multisite, user_register hook is too early so wp_mu_activate_user add user role after
 if ( is_multisite() ) {
-	add_action( 'wpmu_activate_user',    array( $checklist, 'process_checklist' ) ); // Handle Multisite
+//	add_filter( 'signup_user_meta',      array( $checklist, 'mu_add_roles_in_signup' ), 10, 4 ); // Waiting https://core.trac.wordpress.org/ticket/39223
+	$bool = remove_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
+	debug( $bool );
+	add_action( 'wpmu_activate_user',    array( $checklist, 'mu_add_roles_after_activation' ), 10, 3 );
 } else {
 	add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
 }
diff --git a/readme.txt b/readme.txt
index ec8ca5f..006dd80 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
-Tested up to: 4.6.1
-Stable tag: 1.1.1
+Tested up to: 4.7
+Stable tag: 1.1.2
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63,10 +63,16 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.1.2 =
+* 21 december 2016
+* Fix bug in multisite : After adding a new user with email confirmation, the multiple roles were not set, so the user did not have any roles on the site
+
 = 1.1.1 =
+* 4 november 2016
 * Remove PHP closure to ensure Backward Compatibility with PHP versions < 5.3
 
 = 1.1 =
+* 22 october 2016
 * New maintainer : Florian TIAR, you're strongly encouraged to update this plugin
 * Add support of role checkbox in new user form (admin)
 * Add Multisite support (for new user form)
@@ -77,4 +83,5 @@ Sure. The user will still be able to log in and out, but won't be able to access
 * Enhance UX of the form
 
 = 1.0 =
+* 2015
 * Initial release
\ No newline at end of file
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 5a04e55..605be1e 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -6,7 +6,7 @@
  * @var $user_roles array An array of role names belonging to the current user.
  */
 $creating = isset( $_POST['createuser'] );
-$selected_roles = $creating && isset( $_POST['md_multiple_roles'] ) ? wp_unslash( $_POST['md_multiple_roles'] ) : '';
+$selected_roles = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
 ?>
 <h3><?php _e( 'Permissions', 'multiple-roles' ); ?></h3>
 <table class="form-table">
@@ -19,7 +19,7 @@
 					<input
 						id="md-multiple-roles-<?php echo esc_attr( $name ) . '-' . $input_uniq_id; ?>"
 						type="checkbox"
-						name="md_multiple_roles[]"
+						name="role[]"
 						value="<?php echo esc_attr( $name ); ?>"
                         <?php if ( ! is_null( $user_roles ) ) : // Edit user page
                             checked( in_array( $name, $user_roles ) );

From 1fde764a26f7480cfb95375aa23c4944c9b79dd5 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 21 Dec 2016 01:14:25 +0100
Subject: [PATCH 24/50] Bump version

---
 multiple-roles.php |  2 +-
 readme.txt         | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index 8b3a926..666cf1f 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.1.1
+Version: 1.1.2
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
diff --git a/readme.txt b/readme.txt
index 006dd80..fcac0d3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
-Tested up to: 4.7
+Tested up to: 4.6.1
 Stable tag: 1.1.2
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
@@ -63,16 +63,7 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
-= 1.1.2 =
-* 21 december 2016
-* Fix bug in multisite : After adding a new user with email confirmation, the multiple roles were not set, so the user did not have any roles on the site
-
-= 1.1.1 =
-* 4 november 2016
-* Remove PHP closure to ensure Backward Compatibility with PHP versions < 5.3
-
 = 1.1 =
-* 22 october 2016
 * New maintainer : Florian TIAR, you're strongly encouraged to update this plugin
 * Add support of role checkbox in new user form (admin)
 * Add Multisite support (for new user form)
@@ -83,5 +74,4 @@ Sure. The user will still be able to log in and out, but won't be able to access
 * Enhance UX of the form
 
 = 1.0 =
-* 2015
 * Initial release
\ No newline at end of file

From 212a34e49124d55b181bcdcb053712e017f13a7f Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 21 Dec 2016 01:29:39 +0100
Subject: [PATCH 25/50] Fix overwrite off readme

---
 multiple-roles.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index 666cf1f..2cc054e 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -33,8 +33,7 @@
 // In multisite, user_register hook is too early so wp_mu_activate_user add user role after
 if ( is_multisite() ) {
 //	add_filter( 'signup_user_meta',      array( $checklist, 'mu_add_roles_in_signup' ), 10, 4 ); // Waiting https://core.trac.wordpress.org/ticket/39223
-	$bool = remove_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
-	debug( $bool );
+	remove_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
 	add_action( 'wpmu_activate_user',    array( $checklist, 'mu_add_roles_after_activation' ), 10, 3 );
 } else {
 	add_action( 'user_register',         array( $checklist, 'process_checklist' ) );

From 2d69328f8a18e6c1959261b16e6b33888680a822 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 21 Dec 2016 16:07:54 +0100
Subject: [PATCH 26/50] Fix changelog

---
 readme.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index fcac0d3..e995e9d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
-Tested up to: 4.6.1
+Tested up to: 4.7
 Stable tag: 1.1.2
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
@@ -63,7 +63,16 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.1.2 =
+* 21 december 2016
+* Fix bug in multisite : After adding a new user with email confirmation, the multiple roles were not set, so the user did not have any roles on the site
+
+= 1.1.1 =
+* 3 november 2016
+* Remove PHP closure to ensure Backward Compatibility with PHP versions < 5.3
+
 = 1.1 =
+* 24 october 2016
 * New maintainer : Florian TIAR, you're strongly encouraged to update this plugin
 * Add support of role checkbox in new user form (admin)
 * Add Multisite support (for new user form)
@@ -74,4 +83,5 @@ Sure. The user will still be able to log in and out, but won't be able to access
 * Enhance UX of the form
 
 = 1.0 =
+* 2015
 * Initial release
\ No newline at end of file

From a20c026865319780f8c47e4d3dcdbcf9a4c6531b Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Thu, 22 Dec 2016 15:27:27 +0100
Subject: [PATCH 27/50] Fix error when updating user

---
 controllers/checklist.php | 38 +++++++-------------------------------
 multiple-roles.php        |  3 +--
 readme.txt                |  6 +++++-
 views/checklist.html.php  | 10 ++++++++--
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index bff1e12..3731856 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -61,9 +61,14 @@ public function output_checklist( $user ) {
 	 * @param int $user_id The user ID whose roles might get updated.
 	 */
 	public function process_checklist( $user_id ) {
-
 		do_action( 'mdmr_before_process_checklist', $user_id, $_POST['role'] );
 
+		if ( 'user_register' === current_action() ) {
+			$input_name = 'role';
+		} else {
+			$input_name = 'md_multiple_roles';
+		}
+
 		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
 		}
@@ -72,7 +77,7 @@ public function process_checklist( $user_id ) {
 			return;
 		}
 
-		$roles = ( isset( $_POST['role'] ) && is_array( $_POST['role'] ) ) ? $_POST['role'] : array();
+		$roles = ( isset( $_POST[ $input_name ] ) && is_array( $_POST[ $input_name ] ) ) ? $_POST[ $input_name ] : array();
 		if ( empty( $roles ) ) {
 			return;
 		}
@@ -80,34 +85,6 @@ public function process_checklist( $user_id ) {
 		$this->model->update_roles( $user_id, $roles );
 	}
 
-//	/**
-//	 * Add multiple roles in meta array on multisite signups database table
-//	 *
-//	 * @param $meta
-//	 * @param $user
-//	 * @param $user_email
-//	 * @param $key
-//	 *
-//	 * @return mixed
-//	 */
-//	public function mu_add_roles_in_signup( $meta, $user, $user_email, $key ) {
-//
-//		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
-//			return $meta;
-//		}
-//
-//		if ( ! $this->model->can_update_roles() ) {
-//			return $meta;
-//		}
-//
-//		$roles = ( isset( $_POST['role'] ) && is_array( $_POST['role'] ) ) ? $_POST['role'] : array();
-//		if ( ! empty( $roles ) ) {
-//			$meta['role'] = $roles;
-//		}
-//
-//		return $meta;
-//	}
-
 	/**
 	 * Add multiple roles after user activation
 	 *
@@ -124,7 +101,6 @@ public function mu_add_roles_after_activation( $user_id, $password, $meta ) {
 		}
 
 		if ( ! empty( $meta['new_role'] ) ) {
-			$user = get_user_by( 'id', (int) $user_id );
 			$this->model->update_roles( $user_id, $meta['new_role'] );
 		}
 	}
diff --git a/multiple-roles.php b/multiple-roles.php
index 2cc054e..76563a2 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.1.2
+Version: 1.1.3
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
@@ -32,7 +32,6 @@
 // For new user form (in Backoffice)
 // In multisite, user_register hook is too early so wp_mu_activate_user add user role after
 if ( is_multisite() ) {
-//	add_filter( 'signup_user_meta',      array( $checklist, 'mu_add_roles_in_signup' ), 10, 4 ); // Waiting https://core.trac.wordpress.org/ticket/39223
 	remove_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
 	add_action( 'wpmu_activate_user',    array( $checklist, 'mu_add_roles_after_activation' ), 10, 3 );
 } else {
diff --git a/readme.txt b/readme.txt
index e995e9d..15ac08e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
 Tested up to: 4.7
-Stable tag: 1.1.2
+Stable tag: 1.1.3
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63,6 +63,10 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.1.3 =
+* 22 december 2016
+* Fix fatal error in user update : After updating an user, a wp_die error was shown "You can’t give users that role", it was due to changes in 1.1.2
+
 = 1.1.2 =
 * 21 december 2016
 * Fix bug in multisite : After adding a new user with email confirmation, the multiple roles were not set, so the user did not have any roles on the site
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 605be1e..087d2cc 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -5,8 +5,14 @@
  * @var $roles array All WordPress roles in name => label pairs.
  * @var $user_roles array An array of role names belonging to the current user.
  */
+if ( 'user_new_form' === current_action() ) {
+	$input_name = 'role';
+} else {
+	$input_name = 'md_multiple_roles';
+}
 $creating = isset( $_POST['createuser'] );
-$selected_roles = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
+$selected_roles = $creating && isset( $_POST[ $input_name ] ) ? wp_unslash( $_POST[ $input_name ] ) : '';
+
 ?>
 <h3><?php _e( 'Permissions', 'multiple-roles' ); ?></h3>
 <table class="form-table">
@@ -19,7 +25,7 @@
 					<input
 						id="md-multiple-roles-<?php echo esc_attr( $name ) . '-' . $input_uniq_id; ?>"
 						type="checkbox"
-						name="role[]"
+						name="<?php echo $input_name ?>[]"
 						value="<?php echo esc_attr( $name ); ?>"
                         <?php if ( ! is_null( $user_roles ) ) : // Edit user page
                             checked( in_array( $name, $user_roles ) );

From 04e639883f2b021a18a7ea6598545ad7ee29b84e Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Fri, 23 Dec 2016 14:15:19 +0100
Subject: [PATCH 28/50] 1.1.4 : Fix all bugs introduced in 1.1.2, handle
 mulitisite properly

---
 controllers/checklist.php | 75 ++++++++++++++++++++++++++++++---------
 model.php                 |  2 +-
 multiple-roles.php        |  4 +--
 readme.txt                |  7 +++-
 views/checklist.html.php  | 10 ++----
 5 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 3731856..ed495c0 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -61,14 +61,33 @@ public function output_checklist( $user ) {
 	 * @param int $user_id The user ID whose roles might get updated.
 	 */
 	public function process_checklist( $user_id ) {
-		do_action( 'mdmr_before_process_checklist', $user_id, $_POST['role'] );
+		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
+			return;
+		}
+
+		if ( ! $this->model->can_update_roles() ) {
+			return;
+		}
 
-		if ( 'user_register' === current_action() ) {
-			$input_name = 'role';
-		} else {
-			$input_name = 'md_multiple_roles';
+		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
+		if ( empty( $new_roles ) ) {
+			return;
 		}
 
+		$this->model->update_roles( $user_id, $new_roles );
+	}
+
+	/**
+	 * Add multiple roles in the $meta array in wp_signups db table
+	 *
+	 * @since 1.1.4
+	 *
+	 * @param $user
+	 * @param $user_email
+	 * @param $key
+	 * @param $meta
+	 */
+	public function mu_add_roles_in_signup_meta( $user, $user_email, $key, $meta ) {
 		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
 		}
@@ -77,31 +96,53 @@ public function process_checklist( $user_id ) {
 			return;
 		}
 
-		$roles = ( isset( $_POST[ $input_name ] ) && is_array( $_POST[ $input_name ] ) ) ? $_POST[ $input_name ] : array();
-		if ( empty( $roles ) ) {
+		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
+		if ( empty( $new_roles ) ) {
 			return;
 		}
 
-		$this->model->update_roles( $user_id, $roles );
+		global $wpdb;
+
+		// Get user signup
+		// Suppress errors in case the table doesn't exist
+		$suppress = $wpdb->suppress_errors();
+		$signup   = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->signups} WHERE user_email = %s", $user_email ) );
+		$wpdb->suppress_errors( $suppress );
+
+		if ( empty( $signup ) || is_wp_error( $signup ) ) {
+			return new WP_Error( 'md_get_user_signups_failed' );
+		}
+
+		// Add multiple roles to a new array in meta var
+		$meta = maybe_unserialize( $meta );
+		$meta['md_roles'] = $new_roles;
+		$meta = maybe_serialize( $meta );
+
+		// Update user signup with good meta
+		$where        = array( 'signup_id' => (int) $signup->signup_id );
+		$where_format = array( '%d' );
+		$formats      = array( '%s' );
+		$fields       = array( 'meta' => $meta );
+		$result       = $wpdb->update( $wpdb->signups, $fields, $where, $formats, $where_format );
+
+		// Check for errors
+		if ( empty( $result ) && ! empty( $wpdb->last_error ) ) {
+			return new WP_Error( 'md_update_user_signups_failed' );
+		}
 	}
 
 	/**
 	 * Add multiple roles after user activation
 	 *
+	 * @since 1.1.4
+	 *
 	 * @param $user_id
 	 * @param $password
 	 * @param $meta
 	 */
 	public function mu_add_roles_after_activation( $user_id, $password, $meta ) {
-		if ( ! empty( $meta['add_to_blog'] ) ) {
-			$blog_id = $meta['add_to_blog'];
-			remove_user_from_blog( $user_id, get_network()->site_id ); // remove user from main blog.
-			add_user_to_blog( $blog_id, $user_id, '' );
-			update_user_meta( $user_id, 'primary_blog', $blog_id );
-		}
-
-		if ( ! empty( $meta['new_role'] ) ) {
-			$this->model->update_roles( $user_id, $meta['new_role'] );
+		if ( ! empty( $meta['md_roles'] ) ) {
+			$this->model->update_roles( $user_id, $meta['md_roles'] );
 		}
 	}
 
diff --git a/model.php b/model.php
index 1907365..fb8a40c 100644
--- a/model.php
+++ b/model.php
@@ -100,7 +100,7 @@ public function can_update_roles() {
 		do_action( 'mdmr_before_can_update_roles' );
 
 		if ( is_network_admin() || ! current_user_can( 'edit_users' ) || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
-			return false;
+				return false;
 		}
 
 		return true;
diff --git a/multiple-roles.php b/multiple-roles.php
index 76563a2..048609d 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.1.3
+Version: 1.1.4
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
@@ -32,7 +32,7 @@
 // For new user form (in Backoffice)
 // In multisite, user_register hook is too early so wp_mu_activate_user add user role after
 if ( is_multisite() ) {
-	remove_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
+	add_action( 'after_signup_user',     array( $checklist, 'mu_add_roles_in_signup_meta' ), 10, 4 );
 	add_action( 'wpmu_activate_user',    array( $checklist, 'mu_add_roles_after_activation' ), 10, 3 );
 } else {
 	add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
diff --git a/readme.txt b/readme.txt
index 15ac08e..a1f0859 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
 Tested up to: 4.7
-Stable tag: 1.1.3
+Stable tag: 1.1.4
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63,6 +63,11 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.1.4 =
+* 23 december 2016
+* Fix fatal error in new user in single site : After adding an user, a wp_die error was shown "You can’t give users that role", it was due to changes in 1.1.2
+* Workaround to handle multisite support without breaking single site features
+
 = 1.1.3 =
 * 22 december 2016
 * Fix fatal error in user update : After updating an user, a wp_die error was shown "You can’t give users that role", it was due to changes in 1.1.2
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 087d2cc..5a04e55 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -5,14 +5,8 @@
  * @var $roles array All WordPress roles in name => label pairs.
  * @var $user_roles array An array of role names belonging to the current user.
  */
-if ( 'user_new_form' === current_action() ) {
-	$input_name = 'role';
-} else {
-	$input_name = 'md_multiple_roles';
-}
 $creating = isset( $_POST['createuser'] );
-$selected_roles = $creating && isset( $_POST[ $input_name ] ) ? wp_unslash( $_POST[ $input_name ] ) : '';
-
+$selected_roles = $creating && isset( $_POST['md_multiple_roles'] ) ? wp_unslash( $_POST['md_multiple_roles'] ) : '';
 ?>
 <h3><?php _e( 'Permissions', 'multiple-roles' ); ?></h3>
 <table class="form-table">
@@ -25,7 +19,7 @@
 					<input
 						id="md-multiple-roles-<?php echo esc_attr( $name ) . '-' . $input_uniq_id; ?>"
 						type="checkbox"
-						name="<?php echo $input_name ?>[]"
+						name="md_multiple_roles[]"
 						value="<?php echo esc_attr( $name ); ?>"
                         <?php if ( ! is_null( $user_roles ) ) : // Edit user page
                             checked( in_array( $name, $user_roles ) );

From 3e368eacc79be2c54a799fdd2968624af70c3978 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Mon, 21 Aug 2017 16:15:33 +0200
Subject: [PATCH 29/50] Bump version 1.2.0 : enhancements

---
 controllers/checklist.php | 35 ++++++++++++++++++++++++++++++++++-
 multiple-roles.php        |  8 ++++++--
 readme.txt                | 10 ++++++++--
 views/checklist.html.php  |  2 +-
 views/column.html.php     |  2 +-
 5 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index ed495c0..558e88e 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -130,7 +130,40 @@ public function mu_add_roles_in_signup_meta( $user, $user_email, $key, $meta ) {
 			return new WP_Error( 'md_update_user_signups_failed' );
 		}
 	}
-
+	
+	/**
+	 * Add roles in signup meta with WP 4.8 filter : better method
+	 *
+	 * @since 1.2.0
+	 *
+	 * @param $meta
+	 * @param $domain
+	 * @param $path
+	 * @param $title
+	 * @param $user
+	 * @param $user_email
+	 * @param $key
+	 */
+	public function mu_add_roles_in_signup_meta_recently( $meta, $domain, $path, $title, $user, $user_email, $key ) {
+		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
+			return;
+		}
+		
+		if ( ! $this->model->can_update_roles() ) {
+			return;
+		}
+		
+		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
+		if ( empty( $new_roles ) ) {
+			return;
+		}
+		
+		$meta['md_roles'] = $new_roles;
+		
+		return $meta;
+		
+	}
+	
 	/**
 	 * Add multiple roles after user activation
 	 *
diff --git a/multiple-roles.php b/multiple-roles.php
index 048609d..2f84cea 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.1.4
+Version: 1.2.0
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
@@ -32,7 +32,11 @@
 // For new user form (in Backoffice)
 // In multisite, user_register hook is too early so wp_mu_activate_user add user role after
 if ( is_multisite() ) {
-	add_action( 'after_signup_user',     array( $checklist, 'mu_add_roles_in_signup_meta' ), 10, 4 );
+	if ( version_compare( get_bloginfo( 'version' ), '4.8', '>=' ) ) {
+		add_filter( 'signup_site_meta',     array( $checklist, 'mu_add_roles_in_signup_meta_recently' ), 10, 7 );
+	} else {
+		add_action( 'after_signup_user',     array( $checklist, 'mu_add_roles_in_signup_meta' ), 10, 4 );
+	}
 	add_action( 'wpmu_activate_user',    array( $checklist, 'mu_add_roles_after_activation' ), 10, 3 );
 } else {
 	add_action( 'user_register',         array( $checklist, 'process_checklist' ) );
diff --git a/readme.txt b/readme.txt
index a1f0859..5fd0695 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
-Tested up to: 4.7
-Stable tag: 1.1.4
+Tested up to: 4.9
+Stable tag: 1.2.0
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63,6 +63,12 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.2.0 =
+* 21 august 2017
+* Check compatibilty with WP 4.8.1
+* Translation of roles names : thanks to <a href="https://profiles.wordpress.org/benjaminniess/">Benjamin Niess</a>
+* Mutlisite enhancement : Use a WP 4.8 filter to easier edit signup user meta
+
 = 1.1.4 =
 * 23 december 2016
 * Fix fatal error in new user in single site : After adding an user, a wp_die error was shown "You can’t give users that role", it was due to changes in 1.1.2
diff --git a/views/checklist.html.php b/views/checklist.html.php
index 5a04e55..7a9191a 100644
--- a/views/checklist.html.php
+++ b/views/checklist.html.php
@@ -27,7 +27,7 @@
 							checked( in_array( $name, $selected_roles ) );
                         endif; ?>
 					/>
-					<?php echo esc_html( $label ); ?>
+					<?php echo esc_html( translate_user_role( $label ) ); ?>
 				</label>
 				<br />
 			<?php endforeach; ?>
diff --git a/views/column.html.php b/views/column.html.php
index 950483f..66661d2 100644
--- a/views/column.html.php
+++ b/views/column.html.php
@@ -7,7 +7,7 @@
 ?><div class="md-multiple-roles">
 	<?php if ( ! empty( $roles ) ) :
 		foreach( $roles as $name => $label ) :
-			$roles[$name] = '<a href="users.php?role=' . esc_attr( $name ) . '">' . esc_html( $label ) . '</a>';
+			$roles[$name] = '<a href="users.php?role=' . esc_attr( $name ) . '">' . esc_html( translate_user_role( $label ) ) . '</a>';
 		endforeach;
 		echo implode( ', ', $roles );
 	else : ?>

From 7f33f3d2b0371a7dff57051c3d843feace2903a3 Mon Sep 17 00:00:00 2001
From: Thomas Whyles <tom.whyles@outlook.com>
Date: Thu, 12 Apr 2018 13:31:44 +0700
Subject: [PATCH 30/50] Only remove get_editable_roles() roles on update

---
 model.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/model.php b/model.php
index fb8a40c..2894e05 100644
--- a/model.php
+++ b/model.php
@@ -76,8 +76,12 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 
 		$user = get_user_by( 'id', (int) $user_id );
 
-		// remove all roles
-		$user->set_role( '' );
+		// Remove all editable roles
+		$editable = get_editable_roles();
+		$editable_roles = is_array($editable) ? array_keys($editable) : array();
+		foreach( $editable_roles as $role ) {
+			$user->remove_role( $role );
+		}
 
 		foreach( $roles as $role ) {
 			$user->add_role( $role );

From ace2835349e5f286b774666d13b3f92d154ed732 Mon Sep 17 00:00:00 2001
From: thomasfw <thomasfw@users.noreply.github.com>
Date: Thu, 12 Apr 2018 13:48:14 +0700
Subject: [PATCH 31/50] Fixed bug preventing us from unsetting a user's roles
 by unchecking all checklist inputs

---
 controllers/checklist.php | 3 ---
 model.php                 | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 558e88e..7cb00bd 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -70,9 +70,6 @@ public function process_checklist( $user_id ) {
 		}
 
 		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
-		if ( empty( $new_roles ) ) {
-			return;
-		}
 
 		$this->model->update_roles( $user_id, $new_roles );
 	}
diff --git a/model.php b/model.php
index fb8a40c..83923ac 100644
--- a/model.php
+++ b/model.php
@@ -67,10 +67,6 @@ public function update_roles( $user_id = 0, $roles = array() ) {
 
 		do_action( 'mdmr_before_update_roles', $user_id, $roles );
 
-		if ( empty( $roles ) ) {
-			return false;
-		}
-
 		$roles = array_map( 'sanitize_key', (array) $roles );
 		$roles = array_filter( (array) $roles, 'get_role' );
 

From e7939daa2a81c8c01893f9c2e78fedcd9f9b621a Mon Sep 17 00:00:00 2001
From: thomasfw <thomasfw@users.noreply.github.com>
Date: Thu, 12 Apr 2018 13:51:32 +0700
Subject: [PATCH 32/50] Use 'promote_users' cap

---
 model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model.php b/model.php
index fb8a40c..53914d0 100644
--- a/model.php
+++ b/model.php
@@ -99,7 +99,7 @@ public function can_update_roles() {
 
 		do_action( 'mdmr_before_can_update_roles' );
 
-		if ( is_network_admin() || ! current_user_can( 'edit_users' ) || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
+		if ( is_network_admin() || ! current_user_can( 'promote_users' ) || ( defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE && ! current_user_can( 'manage_sites' ) ) ) {
 				return false;
 		}
 

From 5bea79c7d44cbec7dc9242e8d5976dab8795e4c1 Mon Sep 17 00:00:00 2001
From: thomasfw <thomasfw@users.noreply.github.com>
Date: Thu, 12 Apr 2018 14:03:47 +0700
Subject: [PATCH 33/50] Update readme.md

---
 readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 5fd0695..370ef89 100644
--- a/readme.txt
+++ b/readme.txt
@@ -42,7 +42,7 @@ If you want to contribute to this plugin, feel free to check the Github reposito
 
 = Who can edit users roles? =
 
-Anyone with the `edit_users` capability. By default, that means only administrators and network administrators on multi-site.
+Anyone with the `promote_users` capability. By default, that means only administrators and network administrators on multi-site.
 
 = Can you edit your own roles? =
 
@@ -50,7 +50,7 @@ If you're a network administrator on a multi-site setup, yes, you can edit your
 
 = I'm on the user edit screen - where's the checklist of roles? =
 
-It's underneath the default profile stuff, under the heading "Permissions". If you still can't find it, you might be on your own profile page, or you might not have the `edit_users` capability.
+It's underneath the default profile stuff, under the heading "Permissions". If you still can't find it, you might be on your own profile page, or you might not have the `promote_users` capability.
 
 = Can you remove all roles from a user? =
 

From fa74d9c71281796a3190c4e0f185f3af97512c79 Mon Sep 17 00:00:00 2001
From: Florian TIAR <fti@octaveoctave.com>
Date: Thu, 12 Apr 2018 12:45:01 +0200
Subject: [PATCH 34/50] Bump version to 1.3.0

---
 multiple-roles.php | 2 +-
 readme.txt         | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index 2f84cea..0fbf97b 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.2.0
+Version: 1.3.0
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
diff --git a/readme.txt b/readme.txt
index 370ef89..82a910c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
 Tested up to: 4.9
-Stable tag: 1.2.0
+Stable tag: 1.3.0
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63,6 +63,13 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.3.0 =
+* 12 april 2018
+* Use 'promote_users' cap instead of ‘edit_users’
+* Fixed bug preventing us from unsetting a user's roles
+* Only remove get_editable_roles() roles on update
+* Thanks to <a href="https://github.com/thomasfw/">thomasfw</a> for the contributions
+
 = 1.2.0 =
 * 21 august 2017
 * Check compatibilty with WP 4.8.1

From 3c1b661190c4b8ecc88b14c88ff322244e1b78b4 Mon Sep 17 00:00:00 2001
From: thomasfw <thomasfw@users.noreply.github.com>
Date: Mon, 11 Jun 2018 17:33:40 +0700
Subject: [PATCH 35/50] Check for existence of the checklist in
 process_checklist()

---
 controllers/checklist.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 7cb00bd..7274cfa 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -61,7 +61,14 @@ public function output_checklist( $user ) {
 	 * @param int $user_id The user ID whose roles might get updated.
 	 */
 	public function process_checklist( $user_id ) {
-		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
+
+		// The checklist is not always rendered when this method is triggered on 'profile_update' (i.e. when updating a profile programatically),
+		// First check that the 'md_multiple_roles_nonce' is available, else bail. If we continue to process and update_roles(), all user roles will be lost.
+		// We check for 'md_multiple_roles_nonce' rather than 'md_multiple_roles' as this input/variable will be empty if all role inputs are left unchecked.
+		if ( !isset($_POST['md_multiple_roles_nonce']) )
+			return;
+
+		if ( ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
 		}
 
@@ -69,7 +76,7 @@ public function process_checklist( $user_id ) {
 			return;
 		}
 
-		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
+		$new_roles = ( isset($_POST['md_multiple_roles']) && is_array($_POST['md_multiple_roles']) ) ? $_POST['md_multiple_roles'] : array();
 
 		$this->model->update_roles( $user_id, $new_roles );
 	}

From 71eb9a2aea9c21e5cad069c75d6170b4fc4689e0 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 11:43:05 +0100
Subject: [PATCH 36/50] Add minimum PHP version

---
 readme.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 82a910c..20a593d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,6 +4,7 @@ Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit
 Requires at least: 3.1
 Tested up to: 4.9
 Stable tag: 1.3.0
+Requires PHP: 5.4
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -106,4 +107,4 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 = 1.0 =
 * 2015
-* Initial release
\ No newline at end of file
+* Initial release

From 6a6b6c899f63e30866c87bb49415b2e2e6b826f9 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 11:58:21 +0100
Subject: [PATCH 37/50] Fix coding standards

---
 controllers/checklist.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 7274cfa..fce2376 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -62,11 +62,12 @@ public function output_checklist( $user ) {
 	 */
 	public function process_checklist( $user_id ) {
 
-		// The checklist is not always rendered when this method is triggered on 'profile_update' (i.e. when updating a profile programatically),
+		// The checklist is not always rendered when this method is triggered on 'profile_update' (i.e. when updating a profile programmatically),
 		// First check that the 'md_multiple_roles_nonce' is available, else bail. If we continue to process and update_roles(), all user roles will be lost.
 		// We check for 'md_multiple_roles_nonce' rather than 'md_multiple_roles' as this input/variable will be empty if all role inputs are left unchecked.
-		if ( !isset($_POST['md_multiple_roles_nonce']) )
+		if ( ! isset( $_POST['md_multiple_roles_nonce'] ) ) {
 			return;
+		}
 
 		if ( ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
@@ -76,7 +77,7 @@ public function process_checklist( $user_id ) {
 			return;
 		}
 
-		$new_roles = ( isset($_POST['md_multiple_roles']) && is_array($_POST['md_multiple_roles']) ) ? $_POST['md_multiple_roles'] : array();
+		$new_roles = ( isset( $_POST['md_multiple_roles'] ) && is_array( $_POST['md_multiple_roles'] ) ) ? $_POST['md_multiple_roles'] : array();
 
 		$this->model->update_roles( $user_id, $new_roles );
 	}
@@ -90,6 +91,8 @@ public function process_checklist( $user_id ) {
 	 * @param $user_email
 	 * @param $key
 	 * @param $meta
+	 *
+	 * @return void|WP_Error
 	 */
 	public function mu_add_roles_in_signup_meta( $user, $user_email, $key, $meta ) {
 		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {

From 580faac30b4ff368ae742d64cdda2a266027d784 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 11:59:24 +0100
Subject: [PATCH 38/50] Fix indentation

---
 controllers/checklist.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index fce2376..3e43838 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -47,8 +47,8 @@ public function output_checklist( $user ) {
 
 		wp_nonce_field( 'update-md-multiple-roles', 'md_multiple_roles_nonce' );
 
-		$roles        = $this->model->get_editable_roles();
-        $user_roles   = ( isset( $user->roles ) ) ? $user->roles : null;
+		$roles      = $this->model->get_editable_roles();
+		$user_roles = ( isset( $user->roles ) ) ? $user->roles : null;
 
 		include( apply_filters( 'mdmr_checklist_template', MDMR_PATH . 'views/checklist.html.php' ) );
 

From 6f773736064cf771daf60817a1907b7b529a113b Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 12:05:28 +0100
Subject: [PATCH 39/50] Update readme text with new version and changelog

---
 multiple-roles.php | 2 +-
 readme.txt         | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index 0fbf97b..2fd7b22 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.3.0
+Version: 1.3.1
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/
diff --git a/readme.txt b/readme.txt
index 20a593d..9d9682a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
-Tested up to: 4.9
-Stable tag: 1.3.0
+Tested up to: 5.4.2
+Stable tag: 1.3.1
 Requires PHP: 5.4
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
@@ -64,6 +64,11 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.3.1 =
+* 1st july 2020
+* Test the plugin against WordPress 5.4
+* Fix an issue when the user role could be lost because of a wrong check in the backend
+
 = 1.3.0 =
 * 12 april 2018
 * Use 'promote_users' cap instead of ‘edit_users’

From b167b82f33b623a9d038cc785ecac17a80217abd Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 15:46:30 +0100
Subject: [PATCH 40/50] Add WordPress deploy plugin to wordpress.org repo

---
 .github/workflows/main.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..2f6d383
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,5 @@
+- name: WordPress Plugin Deploy
+  uses: 10up/action-wordpress-plugin-deploy@1.5.0
+  with:
+    # Generate package zip file?
+    generate-zip: # optional

From f7e826a9f512745dcebb03410ad6263a13a1266c Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 16:02:02 +0100
Subject: [PATCH 41/50] Delete main.yml

---
 .github/workflows/main.yml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 2f6d383..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: WordPress Plugin Deploy
-  uses: 10up/action-wordpress-plugin-deploy@1.5.0
-  with:
-    # Generate package zip file?
-    generate-zip: # optional

From 850021317c93697dd87cf973c49ca79ea5eba09e Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 16:04:50 +0100
Subject: [PATCH 42/50] Improve github action

---
 .github/workflows/wp_plugin_release.yml | 29 +++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/wp_plugin_release.yml

diff --git a/.github/workflows/wp_plugin_release.yml b/.github/workflows/wp_plugin_release.yml
new file mode 100644
index 0000000..42c9749
--- /dev/null
+++ b/.github/workflows/wp_plugin_release.yml
@@ -0,0 +1,29 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  deploy_wordpressorg:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Runs a single command using the runners shell
+    - name: WordPress Plugin Deploy
+      uses: 10up/action-wordpress-plugin-deploy@1.5.0
+      with:
+        # Generate package zip file?
+        generate-zip: # optional
+

From 40d52cb69c27101e32f628d2a90d83c8d1a65b56 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 1 Jul 2020 16:06:05 +0100
Subject: [PATCH 43/50] Update wp_plugin_release.yml

---
 .github/workflows/wp_plugin_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wp_plugin_release.yml b/.github/workflows/wp_plugin_release.yml
index 42c9749..d5b04c1 100644
--- a/.github/workflows/wp_plugin_release.yml
+++ b/.github/workflows/wp_plugin_release.yml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CI
+name: WordPress plugin release on wordpress.org repo
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch

From ef1499ca0760279924d29d6fa4f54fce397a8a96 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Thu, 2 Jul 2020 10:08:11 +0100
Subject: [PATCH 44/50] Improve workflow

---
 .github/workflows/wp_plugin_release.yml | 33 ++++++++-----------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/wp_plugin_release.yml b/.github/workflows/wp_plugin_release.yml
index d5b04c1..5f05b0e 100644
--- a/.github/workflows/wp_plugin_release.yml
+++ b/.github/workflows/wp_plugin_release.yml
@@ -1,29 +1,16 @@
-# This is a basic workflow to help you get started with Actions
-
-name: WordPress plugin release on wordpress.org repo
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
+name: Deploy to WordPress.org
 on:
   push:
-    branches: [ master ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+    tags:
+    - "*"
 jobs:
-  # This workflow contains a single job called "build"
-  deploy_wordpressorg:
-    # The type of runner that the job will run on
+  tag:
+    name: New tag
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
-
-    # Runs a single command using the runners shell
+    - uses: actions/checkout@master
     - name: WordPress Plugin Deploy
-      uses: 10up/action-wordpress-plugin-deploy@1.5.0
-      with:
-        # Generate package zip file?
-        generate-zip: # optional
-
+      uses: 10up/action-wordpress-plugin-deploy@stable
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

From 6376667de87f40b76980a6ba2a3ea6ffc5611649 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 30 Jun 2021 12:28:27 +0100
Subject: [PATCH 45/50] Fix misuses of nonces

---
 controllers/checklist.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/controllers/checklist.php b/controllers/checklist.php
index 3e43838..76ad4b1 100644
--- a/controllers/checklist.php
+++ b/controllers/checklist.php
@@ -95,7 +95,7 @@ public function process_checklist( $user_id ) {
 	 * @return void|WP_Error
 	 */
 	public function mu_add_roles_in_signup_meta( $user, $user_email, $key, $meta ) {
-		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
+		if ( ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
 		}
 
@@ -152,7 +152,7 @@ public function mu_add_roles_in_signup_meta( $user, $user_email, $key, $meta ) {
 	 * @param $key
 	 */
 	public function mu_add_roles_in_signup_meta_recently( $meta, $domain, $path, $title, $user, $user_email, $key ) {
-		if ( isset( $_POST['md_multiple_roles_nonce'] ) && ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
+		if ( ! wp_verify_nonce( $_POST['md_multiple_roles_nonce'], 'update-md-multiple-roles' ) ) {
 			return;
 		}
 		
@@ -186,4 +186,4 @@ public function mu_add_roles_after_activation( $user_id, $password, $meta ) {
 		}
 	}
 
-}
\ No newline at end of file
+}

From 32483b19c831976c071dddbf42a730983bf1db00 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 30 Jun 2021 12:31:14 +0100
Subject: [PATCH 46/50] Bump readme.txt to 1.3.2

---
 readme.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 9d9682a..777aea6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: SeventhSteel, mista-flo
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
-Tested up to: 5.4.2
-Stable tag: 1.3.1
+Tested up to: 5.7.2
+Stable tag: 1.3.2
 Requires PHP: 5.4
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
@@ -64,6 +64,11 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.3.2 =
+* 30th june 2021
+* Test the plugin against WordPress 5.7
+* Fix the use of nonce for two functions
+
 = 1.3.1 =
 * 1st july 2020
 * Test the plugin against WordPress 5.4

From 4ccf89a2adbcd641e0da97974cc59626694a5100 Mon Sep 17 00:00:00 2001
From: Florian TIAR <contact@tiar-florian.fr>
Date: Wed, 30 Jun 2021 12:31:28 +0100
Subject: [PATCH 47/50] Bump main file to 1.3.2

---
 multiple-roles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index 2fd7b22..eb78595 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.3.1
+Version: 1.3.2
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/

From 165b62f9307fc07fda67465d711f19590bead10a Mon Sep 17 00:00:00 2001
From: Florian TIAR <florian.tiar@theculturetrip.com>
Date: Wed, 25 May 2022 14:14:01 +0100
Subject: [PATCH 48/50] Add the new plugin maintainer

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 777aea6..f358b4b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
 === Multiple Roles ===
-Contributors: SeventhSteel, mista-flo
+Contributors: SeventhSteel, mista-flo, cneumann
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
 Tested up to: 5.7.2

From a5b1c6610fd12b51254c2926c822940072d30258 Mon Sep 17 00:00:00 2001
From: Florian TIAR <florian.tiar@theculturetrip.com>
Date: Wed, 25 May 2022 14:17:14 +0100
Subject: [PATCH 49/50] Update readme.txt

---
 readme.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index f358b4b..e70baa7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: SeventhSteel, mista-flo, cneumann
 Tags: multiple roles, multiple roles per user, user roles, edit user roles, edit roles, more than one role, more than one role per user, more than one role for each user, many roles per user, unlimited roles
 Requires at least: 3.1
 Tested up to: 5.7.2
-Stable tag: 1.3.2
+Stable tag: 1.3.4
 Requires PHP: 5.4
 Donate link: https://www.paypal.me/FlorianTIAR/5
 License: GPLv2 or later
@@ -64,6 +64,10 @@ Sure. The user will still be able to log in and out, but won't be able to access
 
 == Changelog ==
 
+= 1.3.4 =
+* 25th may 2022
+* Add new plugin maintainer: cneumann
+
 = 1.3.2 =
 * 30th june 2021
 * Test the plugin against WordPress 5.7

From d95f59058aa6e4ef201dc8aa13220ea2a2773004 Mon Sep 17 00:00:00 2001
From: Florian TIAR <florian.tiar@theculturetrip.com>
Date: Wed, 25 May 2022 14:17:32 +0100
Subject: [PATCH 50/50] Bump plugin version

---
 multiple-roles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multiple-roles.php b/multiple-roles.php
index eb78595..0d366fa 100644
--- a/multiple-roles.php
+++ b/multiple-roles.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Multiple Roles
 Description: Allow users to have multiple roles on one site.
-Version: 1.3.2
+Version: 1.3.4
 Author: Florian TIAR
 Author URI: http://tiar-florian.fr
 Plugin URI: https://wordpress.org/plugins/multiple-roles/