|
Lines 152-158
sub get_opac_news {
Link Here
|
| 152 |
}; |
152 |
}; |
| 153 |
$query .= ' WHERE 1'; |
153 |
$query .= ' WHERE 1'; |
| 154 |
if ($lang) { |
154 |
if ($lang) { |
| 155 |
$query .= " AND (opac_news.lang='' OR opac_news.lang=?)"; |
155 |
$lang = substr($lang,0,2).'%'; |
|
|
156 |
$query .= " AND (opac_news.lang='' OR opac_news.lang like ?)"; |
| 156 |
push @values,$lang; |
157 |
push @values,$lang; |
| 157 |
} |
158 |
} |
| 158 |
if ($branchcode) { |
159 |
if ($branchcode) { |
|
Lines 188-193
sub get_opac_news {
Link Here
|
| 188 |
sub GetNewsToDisplay { |
189 |
sub GetNewsToDisplay { |
| 189 |
my ($lang,$branch) = @_; |
190 |
my ($lang,$branch) = @_; |
| 190 |
my $dbh = C4::Context->dbh; |
191 |
my $dbh = C4::Context->dbh; |
|
|
192 |
$lang = substr($lang,0,2).'%'; |
| 191 |
# SELECT *,DATE_FORMAT(timestamp, '%d/%m/%Y') AS newdate |
193 |
# SELECT *,DATE_FORMAT(timestamp, '%d/%m/%Y') AS newdate |
| 192 |
my $query = q{ |
194 |
my $query = q{ |
| 193 |
SELECT *,timestamp AS newdate |
195 |
SELECT *,timestamp AS newdate |
|
Lines 198-204
sub GetNewsToDisplay {
Link Here
|
| 198 |
OR expirationdate = '00-00-0000' |
200 |
OR expirationdate = '00-00-0000' |
| 199 |
) |
201 |
) |
| 200 |
AND `timestamp` < CURRENT_DATE()+1 |
202 |
AND `timestamp` < CURRENT_DATE()+1 |
| 201 |
AND (lang = '' OR lang = ?) |
203 |
AND (lang = '' OR lang like ?) |
| 202 |
AND (branchcode IS NULL OR branchcode = ?) |
204 |
AND (branchcode IS NULL OR branchcode = ?) |
| 203 |
ORDER BY number |
205 |
ORDER BY number |
| 204 |
}; # expirationdate field is NOT in ISO format? |
206 |
}; # expirationdate field is NOT in ISO format? |