MT2116: Addons to the CSV export

[koha.git] / edithelp.pl

diff --git a/edithelp.pl b/edithelp.pl
index f9f3c00..362f678 100755 (executable)
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -34,6 +34,8 @@ my $type    = $input->param('type');
 my $referer = $input->param('referer');
 my $oldreferer = $referer;
 my $help    = $input->param('help');
+# strip any DOS-newlines that TinyMCE may have sneaked in
+$help =~ s/\r//g;
 my $error;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -63,14 +65,7 @@ sub _get_filepath ($;$) {
     $referer =~ /.*koha\/(.+)\.pl.*/;
     my $from   = "help/$1.tmpl";
     my $htdocs = C4::Context->config('intrahtdocs');
-       my ($theme, $lang);
-       # This split behavior was part of the old script.  I'm not sure why.  -atz
-       if (@_) {
-               ($theme, $lang) = themelanguage( $htdocs, $from, "intranet", $input );
-       } else {
-               $theme = C4::Context->preference('template');
-               $lang  = C4::Context->preference('language') || 'en';
-       }
+    my ($theme, $lang) = themelanguage( $htdocs, $from, "intranet", $input );
        $debug and print STDERR "help filepath: $htdocs/$theme/$lang/modules/$from";
        return "$htdocs/$theme/$lang/modules/$from";
 }