Change jquery path after update of jquery lib + fix mysql error

1.10.x
Julio Montoya 10 years ago
parent 4a7b1ecac3
commit 338595984c
  1. 4
      main/inc/lib/api.lib.php
  2. 5
      main/inc/lib/events.lib.php
  3. 2
      main/inc/lib/template.lib.php
  4. 2
      main/install/index.php

@ -6461,7 +6461,7 @@ function api_get_css($file, $media = 'screen') {
*/ */
function api_get_jquery_js() function api_get_jquery_js()
{ {
return api_get_asset('jquery/dist/jquery.min.js'); return api_get_asset('jquery/jquery.min.js');
} }
/** /**
@ -6470,7 +6470,7 @@ function api_get_jquery_js()
*/ */
function api_get_jquery_web_path() function api_get_jquery_web_path()
{ {
return api_get_path(WEB_PATH).'web/assets/jquery/dist/jquery.min.js'; return api_get_path(WEB_PATH).'web/assets/jquery/jquery.min.js';
} }
/** /**

@ -1746,9 +1746,10 @@ class Event
$courseId = intval($courseId); $courseId = intval($courseId);
$user_id = intval($user_id); $user_id = intval($user_id);
$session_id = intval($session_id); $session_id = intval($session_id);
$ip = api_get_real_ip();
$sql = "INSERT INTO $course_tracking_table(c_id, user_id, login_course_date, logout_course_date, counter, session_id) $sql = "INSERT INTO $course_tracking_table(c_id, user_ip, user_id, login_course_date, logout_course_date, counter, session_id)
VALUES('".$courseId."', '".$user_id."', '$time', '$time', '1', '".$session_id."')"; VALUES('".$courseId."', '".$ip."', '".$user_id."', '$time', '$time', '1', '".$session_id."')";
Database::query($sql); Database::query($sql);
// Course catalog stats modifications see #4191 // Course catalog stats modifications see #4191

@ -666,7 +666,7 @@ class Template
$bowerJsFiles = [ $bowerJsFiles = [
'modernizr/modernizr.js', 'modernizr/modernizr.js',
'jquery/dist/jquery.min.js', 'jquery/jquery.min.js',
'bootstrap/dist/js/bootstrap.min.js', 'bootstrap/dist/js/bootstrap.min.js',
'jquery-ui/jquery-ui.min.js', 'jquery-ui/jquery-ui.min.js',
'moment/min/moment-with-locales.min.js', 'moment/min/moment-with-locales.min.js',

@ -309,7 +309,7 @@ if ($encryptPassForm == '1') {
@import "../../web/css/base.css"; @import "../../web/css/base.css";
@import "../../web/css/themes/chamilo/default.css"; @import "../../web/css/themes/chamilo/default.css";
</style> </style>
<script type="text/javascript" src="../../web/assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="../../web/assets/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../web/assets/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="../../web/assets/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../inc/lib/javascript/bootstrap-select/js/bootstrap-select.min.js"></script> <script type="text/javascript" src="../inc/lib/javascript/bootstrap-select/js/bootstrap-select.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">

Loading…
Cancel
Save