--- trunk/lib/Frey/Web.pm 2008/11/28 16:39:37 591
+++ trunk/lib/Frey/Web.pm 2008/11/28 19:19:03 600
@@ -87,7 +87,7 @@
sub popup { my $self = shift; $self->popup_dropdown('popup', @_); }
sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
-our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1)>}s; # relaxed html check for one semi-valid tag
+our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1|[^>]+/)>}s; # relaxed html check for one semi-valid tag
sub popup_dropdown {
my ( $self, $type, $name, $content, $full ) = @_;
@@ -121,11 +121,11 @@
$path =~ s!^/!!;
if ( $path =~ m/\.js$/ ) {
$out .= $self->_inline_path( $path ) ?
- qq|| :
+ qq|| :
qq||;
} elsif ( $path =~ m/\.css$/ ) {
$out .= $self->_inline_path( $path ) ?
- qq|| :
+ qq|| :
qq||;
} elsif ( $path =~ m{<.+>}s ) {
$out .= $path;