From: Will Budic <redacted>
Date: Mon, 2 Oct 2023 02:22:14 +0000 (+1100)
Subject: post merge fixes
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=6c9a7ed0b3c25bd3006b08b5d7db1b3deb02e780;p=LifeLog.git

post merge fixes
---

diff --git a/htdocs/cgi-bin/index.cnf b/htdocs/cgi-bin/index.cnf
index 3293f72..acf16ab 100644
--- a/htdocs/cgi-bin/index.cnf
+++ b/htdocs/cgi-bin/index.cnf
@@ -273,16 +273,7 @@ function loadDocResult(content){
 }
 ]#]
 >SCRIPT>
-<SCRIPT<
-[#[
-function demoLogin() {
-    var form = $('#frm_login');
-    $('#frm_login input[name=alias]').val("admin");
-    $('#frm_login input[name=passw]').val("admin");
-    form.submit();
-}
-]#]
->SCRIPT>
+
 
 >>HEADER>TREE>
 
diff --git a/htdocs/cgi-bin/wsrc/feeds.js b/htdocs/cgi-bin/wsrc/feeds.js
index 2a340f8..adc795a 100644
--- a/htdocs/cgi-bin/wsrc/feeds.js
+++ b/htdocs/cgi-bin/wsrc/feeds.js
@@ -38,4 +38,9 @@ function displayFeeds(content){
     $(document).scrollTop( $("#rss_anchor").offset().top );
 }
 
-
+function demoLogin() {
+    var form = $('#frm_login');
+    $('#frm_login input[name=alias]').val("admin");
+    $('#frm_login input[name=passw]').val("admin");
+    form.submit();
+}
diff --git a/install_cpan_modules_required.pl b/install_cpan_modules_required.pl
index 6053496..30c2e28 100755
--- a/install_cpan_modules_required.pl
+++ b/install_cpan_modules_required.pl
@@ -169,7 +169,7 @@ my @kangaroos = sort keys %skip_candidates;
 # Some modules if found to be forcefeed. can be hardcoded here my friends, why not?
 # You got plenty of space on your disc, these days, don't you?
 ##
-foreach ((
+foreach (('lib::relative,',
                 'Syntax::Keyword::Try',
                 'DBD::SQLite',
                 'DBD::Pg',