From 62cfafc67fca3c242cfcd54ef74b5eaf4294b02b Mon Sep 17 00:00:00 2001 From: Alex Schroeder Date: Sun, 4 Sep 2005 02:18:14 +0000 Subject: [PATCH] (UsemodRule): Revers order of match and InElement check as suggested by Markus Lude. Without this patch, single equal signs are eaten when $UseModMarkupInTitles is true. --- modules/usemod.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/usemod.pl b/modules/usemod.pl index fbfe5b8e..a27afe87 100644 --- a/modules/usemod.pl +++ b/modules/usemod.pl @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330 # Boston, MA 02111-1307 USA -$ModulesDescription .= '

$Id: usemod.pl,v 1.23 2005/08/22 19:36:54 as Exp $

'; +$ModulesDescription .= '

$Id: usemod.pl,v 1.24 2005/09/04 02:18:14 as Exp $

'; $DefaultStyleSheet .= <<'EOT' unless $DefaultStyleSheet =~ /table\.user/; # mod_perl? table.user { border-style:solid; border-width:thin; } @@ -112,9 +112,9 @@ sub UsemodRule { $PortraitSupportColor = 0; return $html; } elsif ($UseModMarkupInTitles - && m/\G[ \t]*=+\n?/cg && (InElement('h1') || InElement('h2') || InElement('h3') - || InElement('h4') || InElement('h5') || InElement('h6'))) { + || InElement('h4') || InElement('h5') || InElement('h6')) + && m/\G[ \t]*=+\n?/cg) { return CloseHtmlEnvironments() . AddHtmlEnvironment('p'); } elsif ($bol && !$UseModMarkupInTitles && m/\G(\s*\n)*(\=+)[ \t]*(.+?)[ \t]*(=+)[ \t]*\n?/cg) { my $html = CloseHtmlEnvironments() . ($PortraitSupportColorDiv ? '' : '')