projects
/
matthijs
/
upstream
/
blosxom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e9efcd4
)
Add encode_xml_entities flag to blosxom.cgi to allow plugins to disable.
author
Gavin Carr
<gonzai@users.sourceforge.net>
Thu, 1 Nov 2007 09:20:09 +0000
(09:20 +0000)
committer
Gavin Carr
<gonzai@users.sourceforge.net>
Thu, 1 Nov 2007 09:20:09 +0000
(09:20 +0000)
blosxom.cgi
patch
|
blob
|
history
diff --git
a/blosxom.cgi
b/blosxom.cgi
index 4e19e64a27e20e423427d02a3fdf93045d616553..37480ba3cb53f0508f1d36a852a13820b700e1f6 100755
(executable)
--- a/
blosxom.cgi
+++ b/
blosxom.cgi
@@
-79,7
+79,7
@@
$static_entries = 0;
# --------------------------------
use vars
# --------------------------------
use vars
- qw! $version $blog_title $blog_description $blog_language $blog_encoding $datadir $url %template $template $depth $num_entries $file_extension $default_flavour $static_or_dynamic $config_dir $plugin_list $plugin_path $plugin_dir $plugin_state_dir @plugins %plugins $static_dir $static_password @static_flavours $static_entries $path_info $path_info_yr $path_info_mo $path_info_da $path_info_mo_num $flavour $static_or_dynamic %month2num @num2month $interpolate $entries $output $header $show_future_entries %files %indexes %others !;
+ qw! $version $blog_title $blog_description $blog_language $blog_encoding $datadir $url %template $template $depth $num_entries $file_extension $default_flavour $static_or_dynamic $config_dir $plugin_list $plugin_path $plugin_dir $plugin_state_dir @plugins %plugins $static_dir $static_password @static_flavours $static_entries $path_info $path_info_yr $path_info_mo $path_info_da $path_info_mo_num $flavour $static_or_dynamic %month2num @num2month $interpolate $entries $output $header $show_future_entries %files %indexes %others
$encode_xml_entities
!;
use strict;
use FileHandle;
use strict;
use FileHandle;
@@
-90,6
+90,9
@@
use CGI qw/:standard :netscape/;
$version = "2.0.2";
$version = "2.0.2";
+# 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} ) {
@@
-648,7
+651,7
@@
sub generate {
}
}
}
}
- if ( $content_type =~ m{\bxml\b} ) {
+ if ( $
encode_xml_entities && $
content_type =~ m{\bxml\b} ) {
# Escape <, >, and &, and to produce valid RSS
my %escape = (
# Escape <, >, and &, and to produce valid RSS
my %escape = (