X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=edithelp.pl;h=362f678e86045c61b70bd813f17444a07c361152;hb=c8561fa4a2a698a7ee20fd8b09674303893f2ab5;hp=f9f3c0050806a89fe105c415634bbf3c3be68a0c;hpb=7319cdf9d0b09efa8311d31c4fd75faecc7db2b0;p=koha.git

diff --git a/edithelp.pl b/edithelp.pl
index f9f3c00508..362f678e86 100755
--- 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";
 }