* Removed --sanitize and --no-sanitize, replaced with --plugin htmlscrubber

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 4801c5f92e734df7bf7f9c170519c59b31875c77..e911eaff4de483cb9e1ffe680828b13ab91f6d2d 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -29,7 +29,6 @@ sub getconfig () { #{{{
                        "rss!" => \$config{rss},
                        "cgi!" => \$config{cgi},
                        "notify!" => \$config{notify},
-                       "sanitize!" => \$config{sanitize},
                        "url=s" => \$config{url},
                        "cgiurl=s" => \$config{cgiurl},
                        "historyurl=s" => \$config{historyurl},
@@ -54,7 +53,10 @@ sub getconfig () { #{{{
                        },
                        "plugin=s@" => sub {
                                push @{$config{plugin}}, $_[1];
-                       }
+                       },
+                       "disable-plugin=s@" => sub {
+                               $config{plugin}=[grep { $_ ne $_[1] } @{$config{plugin}} ];
+                       },
                ) || usage();
 
                if (! $config{setup}) {