From 338595984c9d07ff778ef0a4c867d543d5b7d53a Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 6 Jan 2016 10:58:49 +0100
Subject: [PATCH] Change jquery path after update of jquery lib + fix mysql
 error

---
 main/inc/lib/api.lib.php      | 4 ++--
 main/inc/lib/events.lib.php   | 5 +++--
 main/inc/lib/template.lib.php | 2 +-
 main/install/index.php        | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index f83613f3b5..9fe8e1c896 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -6461,7 +6461,7 @@ function api_get_css($file, $media = 'screen') {
  */
 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()
 {
-    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';
 }
 
 /**
diff --git a/main/inc/lib/events.lib.php b/main/inc/lib/events.lib.php
index 8d24d84cb0..063f8b0e1c 100644
--- a/main/inc/lib/events.lib.php
+++ b/main/inc/lib/events.lib.php
@@ -1746,9 +1746,10 @@ class Event
         $courseId = intval($courseId);
         $user_id = intval($user_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)
-                VALUES('".$courseId."', '".$user_id."', '$time', '$time', '1', '".$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."', '".$ip."', '".$user_id."', '$time', '$time', '1', '".$session_id."')";
         Database::query($sql);
 
         // Course catalog stats modifications see #4191
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 65ee02bd34..665dae6305 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -666,7 +666,7 @@ class Template
 
         $bowerJsFiles = [
             'modernizr/modernizr.js',
-            'jquery/dist/jquery.min.js',
+            'jquery/jquery.min.js',
             'bootstrap/dist/js/bootstrap.min.js',
             'jquery-ui/jquery-ui.min.js',
             'moment/min/moment-with-locales.min.js',
diff --git a/main/install/index.php b/main/install/index.php
index ace924ec22..509f9fe57e 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -309,7 +309,7 @@ if ($encryptPassForm == '1') {
         @import "../../web/css/base.css";
         @import "../../web/css/themes/chamilo/default.css";
     </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="../inc/lib/javascript/bootstrap-select/js/bootstrap-select.min.js"></script>
     <script type="text/javascript">