From 7e0b0de6c7263c17580e602fdca1d278d6b972a6 Mon Sep 17 00:00:00 2001
From: mariez <marielazarate@gmail.com>
Date: Mon, 28 Mar 2016 22:05:17 -0300
Subject: [PATCH] going back to default jquery version on header and add
 neccessary bootstrap jquery version on footer, to avoid conflic on upgrade
 page and maybe other that overwrite jquery file.

---
 footer.inc           | 2 +-
 footer_minified.inc  | 2 +-
 pagetop.php          | 2 +-
 pagetop_minified.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/footer.inc b/footer.inc
index 523f7f0..cf023c2 100644
--- a/footer.inc
+++ b/footer.inc
@@ -41,7 +41,7 @@
     <!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-
+<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/phpList3ToBootstrap.js"></script>
 <script type="text/javascript" src="ui/bootlist/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/jcarousellite_1.0.1.min.js"></script>
diff --git a/footer_minified.inc b/footer_minified.inc
index 523f7f0..cf023c2 100644
--- a/footer_minified.inc
+++ b/footer_minified.inc
@@ -41,7 +41,7 @@
     <!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-
+<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/phpList3ToBootstrap.js"></script>
 <script type="text/javascript" src="ui/bootlist/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/jcarousellite_1.0.1.min.js"></script>
diff --git a/pagetop.php b/pagetop.php
index 9bec1e7..b74649d 100644
--- a/pagetop.php
+++ b/pagetop.php
@@ -29,7 +29,7 @@
 
 
 <!-- initial styles and JS from basic application -->
-<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
 <script type="text/javascript" src="js/jquery.tools.scrollable.js"></script>
 <script type="text/javascript" src="js/phplistapp.js"></script>
 <link rel="stylesheet" href="css/app.css" />
diff --git a/pagetop_minified.php b/pagetop_minified.php
index 169fd20..c853be5 100644
--- a/pagetop_minified.php
+++ b/pagetop_minified.php
@@ -26,7 +26,7 @@
 <link rel="apple-touch-icon-precomposed" href="./images/phplist-touch-icon.png" />
 
 <!-- initial styles and JS from basic application -->
-<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
 <script type="text/javascript" src="js/jquery.tools.scrollable.js"></script>
 <script type="text/javascript" src="js/phplistapp.js"></script>
 <link rel="stylesheet" href="css/app.css" />