Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_7919' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-01-02 16:51:37 -05:00
commit c27a981856
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
C4/Category.pm
View file

@ -79,7 +79,7 @@ sub all {
my $dbh = C4::Context->dbh;
# The categories table is small enough for
# `SELECT *` to be harmless.
my $query = "SELECT * FROM categories";
my $query = "SELECT categories.* FROM categories";
$query .= qq{
LEFT JOIN categories_branches ON categories_branches.categorycode = categories.categorycode
WHERE categories_branches.branchcode = ? OR categories_branches.branchcode IS NULL

2
C4/Members.pm
View file

@ -1491,7 +1491,7 @@ sub GetBorrowercategoryList {
? 0
: C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
my $dbh = C4::Context->dbh;
my $query = "SELECT * FROM categories";
my $query = "SELECT categories.* FROM categories";
$query .= qq{
LEFT JOIN categories_branches ON categories.categorycode = categories_branches.categorycode
WHERE branchcode = ? OR branchcode IS NULL GROUP BY description