[Jifty-commit] r6176 - wifty/trunk/lib/Wifty/Form/Field

Jifty commits jifty-commit at lists.jifty.org
Mon Dec 22 21:05:56 EST 2008


Author: ruz
Date: Mon Dec 22 21:05:55 2008
New Revision: 6176

Modified:
   wifty/trunk/lib/Wifty/Form/Field/WikiPage.pm

Log:
* we never used scrubber, delete unused code

Modified: wifty/trunk/lib/Wifty/Form/Field/WikiPage.pm
==============================================================================
--- wifty/trunk/lib/Wifty/Form/Field/WikiPage.pm	(original)
+++ wifty/trunk/lib/Wifty/Form/Field/WikiPage.pm	Mon Dec 22 21:05:55 2008
@@ -47,21 +47,6 @@
 sub wiki_content {
     my $self     = shift;
     my $content  = $self->current_value;
-    my $scrubber = HTML::Scrubber->new();
-
-    $scrubber->default(
-        0,
-        {   '*'   => 0,
-            id    => 1,
-            class => 1,
-            href  => qr{^(?:(?:\w+$)|http:|ftp:|https:|\.?/)}i,
-
-            # Match http, ftp and relative urls
-            face   => 1,
-            size   => 1,
-            target => 1
-        }
-    );
 
     $content =~ s/(?:\n\r|\r\n|\r)/\n/g;
 
@@ -71,16 +56,14 @@
     $scrubber->comment(0);
 
     if (Jifty->config->app('Formatter') eq 'Markdown' ) {
-            require Text::Markdown;
-            $content = Text::Markdown::markdown( $content );
+        require Text::Markdown;
+        $content = Text::Markdown::markdown( $content );
     }
     elsif (Jifty->config->app('Formatter') eq 'Kwiki') {
         require Text::KwikiFormatish;
-        $content = Text::KwikiFormatish::format( $content);
+        $content = Text::KwikiFormatish::format( $content );
     }
-    #$content = $scrubber->scrub( $content );
     return ( $content );
-
 }
 
 =head2 rows


More information about the Jifty-commit mailing list