projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_8945' into 3.12-master
[koha_fer]
/
admin
/
preferences.pl
diff --git
a/admin/preferences.pl
b/admin/preferences.pl
index
055f69d
..
db91e76
100755
(executable)
--- a/
admin/preferences.pl
+++ b/
admin/preferences.pl
@@
-216,6
+216,7
@@
sub SearchPrefs {
foreach my $piece ( @$line ) {
if ( ref( $piece ) eq 'HASH' ) {
foreach my $piece ( @$line ) {
if ( ref( $piece ) eq 'HASH' ) {
+ if ( !$piece->{'pref'} ){ next; }
if ( $piece->{'pref'} =~ /^$searchfield$/i ) {
my ( undef, $LINES ) = TransformPrefsToHTML( $data, $searchfield );
if ( $piece->{'pref'} =~ /^$searchfield$/i ) {
my ( undef, $LINES ) = TransformPrefsToHTML( $data, $searchfield );
@@
-249,7
+250,7
@@
sub SearchPrefs {
sub matches {
my ( $text, $terms ) = @_;
sub matches {
my ( $text, $terms ) = @_;
- return !grep( { $text !~ /$_/i } @$terms );
+ if ( $text ) { return !grep( { $text !~ /$_/i } @$terms ); }
}
my $dbh = C4::Context->dbh;
}
my $dbh = C4::Context->dbh;
@@
-260,7
+261,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,
}
);
@@
-296,7
+297,10
@@
my @TABS;
if ( $op eq 'search' ) {
my $searchfield = $input->param( 'searchfield' );
if ( $op eq 'search' ) {
my $searchfield = $input->param( '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 );