[MKDoc-commit] [1.6] configure external links popups in apache environment, fixed

[bruno at mkdoc.demon.co.uk]

Log Message:
-----------
[1.6] configure external links popups in apache environment, fixed

Tags:
----
mkdoc-1-6

Modified Files:
--------------
    mkd/MKDoc/Site/ConfigWriter:
        Httpd_Conf.pm
    mkd/flo:
        Editor.pm

-------------- next part --------------
Index: Httpd_Conf.pm
===================================================================
RCS file: /var/spool/cvs/mkd/MKDoc/Site/ConfigWriter/Httpd_Conf.pm,v
retrieving revision 1.1.2.41
retrieving revision 1.1.2.42
diff -LMKDoc/Site/ConfigWriter/Httpd_Conf.pm -LMKDoc/Site/ConfigWriter/Httpd_Conf.pm -u -r1.1.2.41 -r1.1.2.42
--- MKDoc/Site/ConfigWriter/Httpd_Conf.pm
+++ MKDoc/Site/ConfigWriter/Httpd_Conf.pm
@@ -220,8 +220,8 @@
 # Uncomment if you want some default text for the users home page.
 # SetEnv MKD__ACCOUNT_HOMEPAGE_CONTENT  $MKDOC_DIR/conf/homepage.txt
 
-# Uncomment this and set the value to 1 if you want external links to open in new windows.
-# SetEnv MKD__EXTERNAL_LINKS_OPEN_IN_NEW_WINDOW 0
+# Uncomment this if you want external links to open in new windows.
+# SetEnv MKD__EXTERNAL_LINKS_OPEN_IN_NEW_WINDOW  TRUE
 
 EOF
 
Index: Editor.pm
===================================================================
RCS file: /var/spool/cvs/mkd/flo/Editor.pm,v
retrieving revision 1.12.2.45
retrieving revision 1.12.2.46
diff -Lflo/Editor.pm -Lflo/Editor.pm -u -r1.12.2.45 -r1.12.2.46
--- flo/Editor.pm
+++ flo/Editor.pm
@@ -31,12 +31,6 @@
 use 5.008_000;
 use utf8;
 
-# Set this to true and external links (as determined by
-# MKDoc::Util::LinkParser) will open in a new window.
-#our $EXTERNAL_LINKS_OPEN_IN_NEW_WINDOW = 0;
-our $EXTERNAL_LINKS_OPEN_IN_NEW_WINDOW = MKDoc::Config->EXTERNAL_LINKS_OPEN_IN_NEW_WINDOW();
-
-
 use constant BLOCK => 'edit_block';
 our $QBLOCK = quotemeta (BLOCK) . "_";   
 
@@ -193,7 +187,7 @@
 
             # setup target to open a new window in needed
             my @target;
-            if ($EXTERNAL_LINKS_OPEN_IN_NEW_WINDOW and 
+            if (MKDoc::Config->EXTERNAL_LINKS_OPEN_IN_NEW_WINDOW() and 
                 not $link_component->is_internal) {
                 @target = (target => "_blank");
             }