X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=edithelp.pl;h=de4e9b12c1b53622da96be498f5a49baefcd1f55;hb=befc07c754eb4c2199c0063f15f9ffb3f3ea8cca;hp=32db0622915cd56b101fa9ef0e2aee663c0cf46a;hpb=b9808b86dfb8363406bc1ffe46f9a663e1813327;p=koha_fer

diff --git a/edithelp.pl b/edithelp.pl
index 32db062291..de4e9b12c1 100755
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -67,7 +67,7 @@ sub _get_filepath ($;$) {
     $referer =~ /koha\/(.*)\.pl/;
     my $from = "help/$1.tt";
     my $htdocs = C4::Context->config('intrahtdocs');
-    my ($theme, $lang) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $input );
+    my ($theme, $lang, $availablethemes) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $input );
 	$debug and print STDERR "help filepath: $htdocs/$theme/$lang/modules/$from";
 	return "$htdocs/$theme/$lang/modules/$from";
 }
@@ -96,15 +96,13 @@ elsif ( $type eq 'modify' ) {
 		$error = "Cannot read file: '$file'.";
 	} else {
 		(-w $file) or $error = 
-			"WARNING: You will not be able save, because your webserver cannot write to '$file'. Contact your admin about help file permissions.";
-    	open (INFILE, $file) or die "Cannot read file '$file'";		# unlikely death, since we just checked
+			"WARNING: You will not be able to save, because your webserver cannot write to '$file'. Contact your admin about help file permissions.";
+    	open (my $fh, '<', $file) or die "Cannot read file '$file'";		# unlikely death, since we just checked
 		my $help = '';
-		while ( my $inp = <INFILE> ) {
-			unless ( $inp =~ /INCLUDE/ ) {
-				$help .= $inp;
-			}
+        while ( <$fh> ) {
+            $help .= /\[% INCLUDE .* %\](.*)$/ ? $1 : $_;
 		}
-		close INFILE;
+		close $fh;
     	$template->param( 'help' => $help );
 		$type = 'save';
 	}