projects
/
srvgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 16866: Catch warning t/db_dependent/Languages.t
[srvgit]
/
edithelp.pl
diff --git
a/edithelp.pl
b/edithelp.pl
index
ce0c075
..
dca61b1
100755
(executable)
--- a/
edithelp.pl
+++ b/
edithelp.pl
@@
-17,12
+17,11
@@
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
# 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 qw ( -utf8 );
use C4::Output;
use C4::Templates;
use C4::Auth;
use CGI qw ( -utf8 );
-use warnings;
use vars qw($debug);
use vars qw($debug);
@@
-53,7
+52,6
@@
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
borrowers => 1,
permissions => 1,
reserveforothers => 1,
borrowers => 1,
permissions => 1,
reserveforothers => 1,
- borrow => 1,
reserveforself => 1,
editcatalogue => 1,
updatecharges => 1,
reserveforself => 1,
editcatalogue => 1,
updatecharges => 1,
@@
-77,7
+75,7
@@
sub _get_filepath ($;$) {
$type = 'create' if $type eq 'addnew';
if ( $type eq 'create' || $type eq 'save' ) {
my $file = _get_filepath($referer);
$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
if ( $fh ) {
# file is open write to it
print $fh
@@
-99,13
+97,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.";
} 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 : $_;
while ( <$fh> ) {
$help .= /\[% INCLUDE .* %\](.*)$/ ? $1 : $_;
-
}
-
close $fh;
- $template->param( 'help' => $help );
+ }
+ close $fh;
+
$template->param( 'help' => $help );
$type = 'save';
}
}
$type = 'save';
}
}