Merge pull request #26 from michaelryanmcneill/2.0.2-alpha

Bumping version to 2.0.2

options-user.php

@@ -227,7 +227,7 @@ function shibboleth_link_accounts() {
 							exit;
 						}
 					} else {
-						$initator_url = shibboleth_session_initiator_url( get_edit_user_link() . '?shibboleth=link' );
+						$initiator_url = shibboleth_session_initiator_url( get_edit_user_link() . '?shibboleth=link' );
 						wp_redirect( $initiator_url );
 						exit;
 					}

readme.txt

@@ -3,7 +3,7 @@ Contributors: michaelryanmcneill, willnorris, mitchoyoshitaka, jrchamp, dericcra
 Tags: shibboleth, authentication, login, saml
 Requires at least: 3.3
 Tested up to: 4.9.2
-Stable tag: 2.0.1
+Stable tag: 2.0.2
 
 Allows WordPress to externalize user authentication and account creation to a Shibboleth Service Provider.
 
@@ -152,7 +152,7 @@ Yes, the plugin allows for all settings to be controlled via constants in `wp-co
    - PHP 7.0 (and above) example: `define('SHIBBOLETH_ROLES', array( 'administrator' => array( 'header' => 'entitlement', 'value' => 'urn:mace:example.edu:entitlement:wordpress:admin' ), 'author' => array( 'header' => 'affiliation', 'value' => 'faculty' ) ) );`
  - `SHIBBOLETH_DEFAULT_ROLE`
    - Format: string
-   - Available options: All available WordPress roles. The defaults are `'administrator'`, `'subscriber'`, `'author'`, `'editor'`, and `'contributor'`.
+   - Available options: All available WordPress roles. The defaults are `'administrator'`, `'subscriber'`, `'author'`, `'editor'`, and `'contributor'`. Leave this constant empty `''` to make the default no allowed access.
    - Example: `define('SHIBBOLETH_MANUALLY_COMBINE_ACCOUNTS', 'subscriber');`
  - `SHIBBOLETH_UPDATE_ROLES`
    - Format: boolean
@@ -170,13 +170,19 @@ Yes, the plugin allows for all settings to be controlled via constants in `wp-co
 3. Assign users into WordPress roles based on arbitrary data provided by Shibboleth
 
 == Upgrade Notice ==
+= 2.0.2 =
+This update brings with it a major change to the way Shibboleth attributes are accessed from versions less than 2.0. For most users, no additional configuration will be necessary. If you are using a specialized server configuration, such as a Shibboleth Service Provider on a reverse proxy or a server configuration that results in environment variables being sent with the prefix REDIRECT_, you should see the changelog for additional details: https://wordpress.org/plugins/shibboleth/#developers
+
 = 2.0.1 =
 This update brings with it a major change to the way Shibboleth attributes are accessed from versions less than 2.0. For most users, no additional configuration will be necessary. If you are using a specialized server configuration, such as a Shibboleth Service Provider on a reverse proxy or a server configuration that results in environment variables being sent with the prefix REDIRECT_, you should see the changelog for additional details: https://wordpress.org/plugins/shibboleth/#developers
 
 = 2.0 =
 This update brings with it a major change to the way Shibboleth attributes are accessed. For most users, no additional configuration will be necessary. If you are using a specialized server configuration, such as a Shibboleth Service Provider on a reverse proxy or a server configuration that results in environment variables being sent with the prefix REDIRECT_, you should see the changelog for additional details: https://wordpress.org/plugins/shibboleth/#developers
 
 == Changelog ==
+= version 2.0.2 (2018-01-17) =
+ - Resolved an issue that caused manual linking of accounts to fail if user's didn't have an existing Shibboleth session. 
+
 = version 2.0.1 (2018-01-17) =
  - Resolved a regression that prevented accounts from being created if they matched a group; [thanks to @Androclese for reporting](https://github.com/michaelryanmcneill/shibboleth/issues/22).
  - Resolved an issue where assets were not being properly included in the WordPress.org packaged plugin. 

shibboleth.php

@@ -4,12 +4,12 @@
  Plugin URI: http://wordpress.org/extend/plugins/shibboleth
  Description: Easily externalize user authentication to a <a href="http://shibboleth.internet2.edu">Shibboleth</a> Service Provider
  Author: Michael McNeill, mitcho (Michael 芳貴 Erlewine), Will Norris
- Version: 2.0.1
+ Version: 2.0.2
  License: Apache 2 (http://www.apache.org/licenses/LICENSE-2.0.html)
  */
 
 define( 'SHIBBOLETH_MINIMUM_WP_VERSION', '3.3' );
-define( 'SHIBBOLETH_PLUGIN_VERSION', '2.0.1' );
+define( 'SHIBBOLETH_PLUGIN_VERSION', '2.0.2' );
 
 /**
  * Determine if this is a new install or upgrade and, if so, run the