Shib plugin not targeting the current sites domain in Multisite setup.

In a multi-site setup the plugin seems to always use the main blog (#1) as the selected site. This causes problems in my setup and always redirects users logging in to the admin section of the main site.The issue seems to stem from the use of $GLOBALS[‘current_site’]->blog_id in the shibboleth_session_initiator_url function. This has been happening for quite some time now (Since at least version 1.6) and I had to create my own function (See below) to get around the problem. I was wondering if a more permanent resolution could be put in place. Thank you.

function shibboleth_select_current_site() {
if ( !empty( $GLOBALS[‘current_blog’]->blog_id ) && $GLOBALS[‘current_blog’]->blog_id > 1 ) {
return $GLOBALS[‘current_blog’]->blog_id;
} else {
return $GLOBALS[‘current_site’]->blog_id;
}
}