do not load jquery twice

2 files changed, 4 insertions, 1 deletions

diff --git a/templates/index.php b/templates/index.php
index b3e1d8f..4795f16 100755
--- a/templates/index.php
+++ b/templates/index.php
@@ -18,7 +18,8 @@ $file = str_replace("href=\"","href=\"".$root."/CarnetElectron/",$file);
 
 $file = preg_replace_callback('/<script(.*?)src=\"(.*?\.js(?:\?.*?)?)"/s',function ($matches) {
     global $currentpath;
-
+    if($matches[2] === "libs/jquery.min.js")
+        return "";
     return "<script".$matches[1]."src=\"".$matches[2]."?mtime=".filemtime($currentpath.$matches[2])."\"";
 }, $file);
 
diff --git a/templates/settings.php b/templates/settings.php
index 8b4f4fa..f54569d 100755
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -13,6 +13,8 @@ $file = str_replace("href=\"","href=\"".$root."/CarnetElectron/",$file);
 
 preg_match_all('/<script.*?src=\"(.*?\.js(?:\?.*?)?)"/si', $file, $matches, PREG_PATTERN_ORDER);
 for ($i = 0; $i < count($matches[1]); $i++) {
+    if($matches[1][$i] === "libs/jquery.min.js")
+        continue;
     script("carnet","../templates/CarnetElectron/".substr($matches[1][$i],0,-3));
 }
 if($_['carnet_display_fullscreen']==="yes")