Bugzilla – Attachment 100432 Details for
Bug 17845
Printers related code should be removed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17845: Adjust few other occurrences
Bug-17845-Adjust-few-other-occurrences.patch (text/plain), 3.11 KB, created by
Jonathan Druart
on 2020-03-10 10:13:14 UTC
(
hide
)
Description:
Bug 17845: Adjust few other occurrences
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-03-10 10:13:14 UTC
Size:
3.11 KB
patch
obsolete
>From 0fa37f4d541dfbc12328e2ef5f28aa5543cc332d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 10 Mar 2020 10:39:49 +0100 >Subject: [PATCH] Bug 17845: Adjust few other occurrences > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > Koha/Script.pm | 4 ++-- > misc/commit_file.pl | 2 +- > t/Token.t | 7 +++---- > 3 files changed, 6 insertions(+), 7 deletions(-) > >diff --git a/Koha/Script.pm b/Koha/Script.pm >index 4e8f5a6ddc..2126d18506 100644 >--- a/Koha/Script.pm >+++ b/Koha/Script.pm >@@ -47,7 +47,7 @@ sub import { > # Set userenv > C4::Context->_new_userenv(1); > C4::Context->set_userenv( >- undef, undef, undef, 'CRON', 'CRON', undef, >+ undef, undef, undef, 'CRON', 'CRON', > undef, undef, undef, undef, undef > ); > >@@ -58,7 +58,7 @@ sub import { > else { > # Set userenv > C4::Context->set_userenv( >- undef, undef, undef, 'CLI', 'CLI', undef, >+ undef, undef, undef, 'CLI', 'CLI', > undef, undef, undef, undef, undef > ); > >diff --git a/misc/commit_file.pl b/misc/commit_file.pl >index bb7dd037a6..639f7dfb42 100755 >--- a/misc/commit_file.pl >+++ b/misc/commit_file.pl >@@ -41,7 +41,7 @@ if ($list_batches) { > > # FIXME dummy user so that logging won't fail > # in future, probably should tie to a real user account >-C4::Context->set_userenv(0, 'batch', 0, 'batch', 'batch', 'batch', 'batch', 'batch'); >+C4::Context->set_userenv(0, 'batch', 0, 'batch', 'batch', 'batch', 'batch'); > > my $dbh = C4::Context->dbh; > $dbh->{AutoCommit} = 0; >diff --git a/t/Token.t b/t/Token.t >index 9fd62d483f..53c7ffaa0d 100644 >--- a/t/Token.t >+++ b/t/Token.t >@@ -27,7 +27,7 @@ use C4::Context; > use Koha::Token; > > C4::Context->_new_userenv('DUMMY SESSION'); >-C4::Context->set_userenv(0,42,0,'firstname','surname', 'CPL', 'Library 1', 0, ', '); >+C4::Context->set_userenv(0,42,0,'firstname','surname', 'CPL', 'Library 1', 0, ''); > > my $tokenizer = Koha::Token->new; > is( length( $tokenizer->generate ), 1, "Generate without parameters" ); >@@ -67,8 +67,7 @@ subtest 'Same id (cookie CGISESSID) with an other logged in user' => sub { > $result = $tokenizer->check_csrf({ > session_id => $id, token => $csrftoken, > }); >- is( $result, 1, "CSRF token verified" ); >- C4::Context->set_userenv(0,43,0,'firstname','surname', 'CPL', 'Library 1', 0, ', '); >+ C4::Context->set_userenv(0,43,0,'firstname','surname', 'CPL', 'Library 1', 0, ''); > $result = $tokenizer->check_csrf({ > session_id => $id, token => $csrftoken, > }); >@@ -77,7 +76,7 @@ subtest 'Same id (cookie CGISESSID) with an other logged in user' => sub { > > subtest 'Same logged in user with another session (cookie CGISESSID)' => sub { > plan tests => 2; >- C4::Context->set_userenv(0,42,0,'firstname','surname', 'CPL', 'Library 1', 0, ', '); >+ C4::Context->set_userenv(0,42,0,'firstname','surname', 'CPL', 'Library 1', 0, ''); > $csrftoken = $tokenizer->generate_csrf({ session_id => $id }); > $result = $tokenizer->check_csrf({ > session_id => $id, token => $csrftoken, >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17845
:
79008
|
79553
|
79598
|
100396
|
100397
|
100398
|
100399
|
100400
|
100427
|
100428
|
100429
|
100430
|
100431
| 100432 |
100433
|
100434