post merge fixes

diff --git a/htdocs/cgi-bin/index.cnf b/htdocs/cgi-bin/index.cnf
index 3293f72491e85b8c574eca4795dbc6754bec9c03..acf16ab7eaeb338739c30107c9c9803ad407b0b5 100644 (file)
--- 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 2a340f8bdae5b1cac71f086581a0d119f5d4ad1c..adc795a49b56f43c9fa2dcfcd7e5d85dcbbe7e6a 100644 (file)
--- 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 60534961a580f94be50af49f4cad664d8d370bda..30c2e28a0b85910807c32ab5c86fe9ef9828f3b7 100755 (executable)
--- 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',