Commit bbc0adb0 authored by Melissa Draper's avatar Melissa Draper
Browse files

Fix mnet jump-back link regression (Bug #1079260)

Was broken by commit 544c62b7 for
(Bug #941551)

Change-Id: I5ef546564677927e96541791ca3bbee1869e544b
parent 63395f24
......@@ -109,7 +109,7 @@ class AuthXmlrpc extends Auth {
$peer = get_peer($remotewwwroot);
if ($peer->deleted != 0 || $this->config['theyssoin'] != 1) {
throw new XmlrpcClientException('We don\'t accept SSO connections from ' . institution_display_name($peer->name));
throw new XmlrpcClientException('We don\'t accept SSO connections from ' . institution_display_name($peer->institution));
}
$client = new Client();
......
......@@ -2453,7 +2453,7 @@ function profile_sideblock() {
if ($authobj->authname == 'xmlrpc') {
$peer = get_peer($authobj->wwwroot);
if ($SESSION->get('mnetuser')) {
$data['mnetloggedinfrom'] = get_string('youhaveloggedinfrom', 'auth.xmlrpc', $authobj->wwwroot, institution_display_name($peer->name));
$data['mnetloggedinfrom'] = get_string('youhaveloggedinfrom', 'auth.xmlrpc', $authobj->wwwroot, institution_display_name($peer->institution));
}
else {
$data['peer'] = array('name' => $peer->name, 'wwwroot' => $peer->wwwroot);
......
......@@ -311,7 +311,7 @@ if ($mnetviewlist = $SESSION->get('mnetviewaccess')) {
require_once(get_config('docroot') . 'api/xmlrpc/lib.php');
if ($peer = get_peer_from_instanceid($SESSION->get('authinstance'))) {
$smarty->assign('mnethost', array(
'name' => institution_display_name($peer->name),
'name' => $peer->name,
'url' => $returnurl ? $returnurl : $peer->wwwroot,
));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment