projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_10097' into 3.14-master
[koha.git]
/
admin
/
preferences.pl
diff --git
a/admin/preferences.pl
b/admin/preferences.pl
index
0dcec19
..
2182591
100755
(executable)
--- a/
admin/preferences.pl
+++ b/
admin/preferences.pl
@@
-21,6
+21,7
@@
use strict;
use warnings;
use CGI;
use warnings;
use CGI;
+
use C4::Auth;
use C4::Context;
use C4::Koha;
use C4::Auth;
use C4::Context;
use C4::Koha;
@@
-34,6
+35,7
@@
use File::Spec;
use IO::File;
use YAML::Syck qw();
$YAML::Syck::ImplicitTyping = 1;
use IO::File;
use YAML::Syck qw();
$YAML::Syck::ImplicitTyping = 1;
+$YAML::Syck::ImplicitUnicode = 1; # force utf-8 for preference encoding
our $lang;
# use Smart::Comments;
our $lang;
# use Smart::Comments;
@@
-261,7
+263,7
@@
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { parameters =>
1
},
+ flagsrequired => { parameters =>
'parameters_remaining_permissions'
},
debug => 1,
}
);
debug => 1,
}
);
@@
-295,9
+297,13
@@
if ( $op eq 'save' ) {
my @TABS;
if ( $op eq 'search' ) {
my @TABS;
if ( $op eq 'search' ) {
- my $searchfield = $input->param( 'searchfield' );
+ my $searchfield = $input->param('searchfield');
+ utf8::decode($searchfield);
- $searchfield =~ s/[^a-zA-Z0-9_ -]//g;
+ $searchfield =~ s/\p{IsC}//g;
+ $searchfield =~ s/\s+/ /;
+ $searchfield =~ s/^\s+//;
+ $searchfield =~ s/\s+$//;
$template->param( searchfield => $searchfield );
$template->param( searchfield => $searchfield );