Commit 59bbecac authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Gerrit Code Review

Merge "Bug 1749892: Fixing some testclient issues"

parents 7c87e1f6 fdd386a2
......@@ -1949,7 +1949,13 @@ class LiveUser extends User {
private function store_sessionid() {
$sessionid = $this->get('sessionid');
delete_records('usr_session', 'usr', $this->get('id'));
if (get_config('productionmode') == false) {
// Allow webservice test client work without needing to login to get results
delete_records('usr_session', 'session', $sessionid);
}
else {
delete_records('usr_session', 'usr', $this->get('id'));
}
$useragent = 'unknown';
if (isset($_SERVER['HTTP_USER_AGENT'])) {
$useragent = $_SERVER['HTTP_USER_AGENT'];
......
......@@ -161,7 +161,7 @@ if (!empty($authtype)) {
$authinstances = auth_get_auth_instances();
$options = array();
foreach ($authinstances as $authinstance) {
$options[$authinstance->instancename] = $authinstance->displayname . ': ' . $authinstance->instancename;
$options[$authinstance->authname] = $authinstance->instancename;
}
$elements[$name] = array(
'type' => 'select',
......
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