gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 14813: Fix encoding issues on editing help pages 

It has been introduced by bug 11944.

Test plan:
1/ Install and set the fr-FR language (or ar-Arab).
2/ Go on the help page and edit it.
3/ The textarea should not contain encoding issues with this patch.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit d671b8661c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:
	edithelp.pl
This commit is contained in:
Jonathan Druart 2015-09-14 10:28:01 +01:00 committed by Liz Rea
parent 2ed639cfb4
commit 16ebbebe4f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
edithelp.pl
View File

@ -17,12 +17,12 @@
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use Modern::Perl;
use C4::Output;
use C4::Templates;
use C4::Auth;
use CGI;
use warnings;
use CGI qw ( -utf8 );
use vars qw($debug);
@ -77,7 +77,7 @@ sub _get_filepath ($;$) {
$type = 'create' if $type eq 'addnew';
if ( $type eq 'create' || $type eq 'save' ) {
my $file = _get_filepath($referer);
open my $fh, ">", $file;
open my $fh, ">:encoding(utf-8)", $file;
if ( $fh ) {
# file is open write to it
print $fh
@ -99,13 +99,13 @@ elsif ( $type eq 'modify' ) {
} else {
(-w $file) or $error =
"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 = '';
open (my $fh, '<:encoding(utf-8)', $file) or die "Cannot read file '$file'"; # unlikely death, since we just checked
my $help = '';
while ( <$fh> ) {
$help .= /\[% INCLUDE .* %\](.*)$/ ? $1 : $_;
}
close $fh;
$template->param( 'help' => $help );
}
close $fh;
$template->param( 'help' => $help );
$type = 'save';
}
}