From 7cbd31ad321debfc267b7ba8f16076062f349b4f Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Thu, 15 Jan 2015 15:17:30 +0100
Subject: [PATCH] Update the logout-iframe.php endpoint to use jQuery v1.6
instead of v1.5.
---
modules/core/templates/logout-iframe.php | 2 --
modules/core/www/idp/logout-iframe.php | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules/core/templates/logout-iframe.php b/modules/core/templates/logout-iframe.php
index 8333580ba..02291f72d 100644
--- a/modules/core/templates/logout-iframe.php
+++ b/modules/core/templates/logout-iframe.php
@@ -50,8 +50,6 @@ if (!isset($this->data['head'])) {
$this->data['head'] = '';
}
-$this->data['head'] .= '<script type="text/javascript" src="/' . $this->data['baseurlpath'] . 'resources/jquery.js"></script>';
-
$this->data['head'] .= '
<script type="text/javascript" language="JavaScript">
window.stateImage = ' . json_encode($stateImage) . ';
diff --git a/modules/core/www/idp/logout-iframe.php b/modules/core/www/idp/logout-iframe.php
index 07a472db0..e2a136e4c 100644
--- a/modules/core/www/idp/logout-iframe.php
+++ b/modules/core/www/idp/logout-iframe.php
@@ -114,5 +114,6 @@ $t->data['id'] = $id;
$t->data['type'] = $type;
$t->data['from'] = $state['core:Logout-IFrame:From'];
$t->data['SPs'] = $state['core:Logout-IFrame:Associations'];
+$t->data['jquery'] = array('version' => '1.6', 'core' => TRUE, 'ui' => FALSE, 'css' => FALSE);
$t->show();
exit(0);
--
GitLab