Skip to content
Snippets Groups Projects
Commit 360b7b24 authored by Jaime Perez Crespo's avatar Jaime Perez Crespo
Browse files

Stop allowing jQuery 1.5 in the template generic header.

parent 7cbd31ad
No related branches found
No related tags found
No related merge requests found
...@@ -59,22 +59,11 @@ if(array_key_exists('header', $this->data)) { ...@@ -59,22 +59,11 @@ if(array_key_exists('header', $this->data)) {
<?php <?php
if(!empty($jquery)) { if(!empty($jquery)) {
$version = '1.5'; $version = '1.6';
if (array_key_exists('version', $jquery)) if (array_key_exists('version', $jquery))
$version = $jquery['version']; $version = $jquery['version'];
if ($version == '1.5') { if ($version == '1.6') {
if (isset($jquery['core']) && $jquery['core'])
echo('<script type="text/javascript" src="/' . $this->data['baseurlpath'] . 'resources/jquery.js"></script>' . "\n");
if (isset($jquery['ui']) && $jquery['ui'])
echo('<script type="text/javascript" src="/' . $this->data['baseurlpath'] . 'resources/jquery-ui.js"></script>' . "\n");
if (isset($jquery['css']) && $jquery['css'])
echo('<link rel="stylesheet" media="screen" type="text/css" href="/' . $this->data['baseurlpath'] .
'resources/uitheme/jquery-ui-themeroller.css" />' . "\n");
} else if ($version == '1.6') {
if (isset($jquery['core']) && $jquery['core']) if (isset($jquery['core']) && $jquery['core'])
echo('<script type="text/javascript" src="/' . $this->data['baseurlpath'] . 'resources/jquery-16.js"></script>' . "\n"); echo('<script type="text/javascript" src="/' . $this->data['baseurlpath'] . 'resources/jquery-16.js"></script>' . "\n");
...@@ -83,7 +72,7 @@ if(!empty($jquery)) { ...@@ -83,7 +72,7 @@ if(!empty($jquery)) {
if (isset($jquery['css']) && $jquery['css']) if (isset($jquery['css']) && $jquery['css'])
echo('<link rel="stylesheet" media="screen" type="text/css" href="/' . $this->data['baseurlpath'] . echo('<link rel="stylesheet" media="screen" type="text/css" href="/' . $this->data['baseurlpath'] .
'resources/uitheme16/ui.all.css" />' . "\n"); 'resources/uitheme16/ui.all.css" />' . "\n");
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment