projects
/
matthijs
/
upstream
/
blosxom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved $encode_xml_entities setting to configuration section since it's also useful...
[matthijs/upstream/blosxom.git]
/
blosxom.cgi
diff --git
a/blosxom.cgi
b/blosxom.cgi
index 072ddf88f03c3ccefb22c265392ef59532e0b69f..06ca9f752d91e0afc004bbf93c25e3d5be111222 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-1,8
+1,8
@@
#!/usr/bin/perl
# Blosxom
#!/usr/bin/perl
# Blosxom
-# Author: Rael Dornfest (2003), The Blosxom Development Team (2005-2008)
-# Version: 2.1.0
+# Author: Rael Dornfest (200
2-200
3), The Blosxom Development Team (2005-2008)
+# Version: 2.1.0
+dev ($Id: blosxom.cgi,v 1.80 2008/07/25 18:22:09 xtaran Exp $)
# Home/Docs/Licensing: http://blosxom.sourceforge.net/
# Development/Downloads: http://sourceforge.net/projects/blosxom
# Home/Docs/Licensing: http://blosxom.sourceforge.net/
# Development/Downloads: http://sourceforge.net/projects/blosxom
@@
-76,6
+76,9
@@
$static_password = "";
# 0 = no, 1 = yes
$static_entries = 0;
# 0 = no, 1 = yes
$static_entries = 0;
+# Should I encode entities for xml content-types? (plugins can turn this off if they do it themselves)
+$encode_xml_entities = 1;
+
# --------------------------------
use vars
# --------------------------------
use vars
@@
-90,9
+93,6
@@
use CGI qw/:standard :netscape/;
$version = "2.1.0";
$version = "2.1.0";
-# Should I encode entities for xml content-types? (plugins can turn this off if they do it themselves)
-$encode_xml_entities = 1;
-
# Load configuration from $ENV{BLOSXOM_CONFIG_DIR}/blosxom.conf, if it exists
my $blosxom_config;
if ( $ENV{BLOSXOM_CONFIG_FILE} && -r $ENV{BLOSXOM_CONFIG_FILE} ) {
# Load configuration from $ENV{BLOSXOM_CONFIG_DIR}/blosxom.conf, if it exists
my $blosxom_config;
if ( $ENV{BLOSXOM_CONFIG_FILE} && -r $ENV{BLOSXOM_CONFIG_FILE} ) {
@@
-660,7
+660,9
@@
sub generate {
}
}
}
}
- if ( $encode_xml_entities && $content_type =~ m{\bxml\b} ) {
+ if ( $encode_xml_entities &&
+ $content_type =~ m{\bxml\b} &&
+ $content_type !~ m{\bxhtml\b} ) {
# Escape special characters inside the <link> container
# The following line should be moved more towards to top for
# Escape special characters inside the <link> container
# The following line should be moved more towards to top for