Merge branch 'master' into converter-optimizations
This commit is contained in:
commit
ff7d1a250e
@ -247,13 +247,13 @@ public class SearchSiteInfoService {
|
|||||||
|
|
||||||
public String getLayout() {
|
public String getLayout() {
|
||||||
// My CSS is too weak to handle this in CSS alone, so I guess we're doing layout in Java...
|
// My CSS is too weak to handle this in CSS alone, so I guess we're doing layout in Java...
|
||||||
if (similar.size() < 25) {
|
if (similar != null && similar.size() < 25) {
|
||||||
return "lopsided";
|
return "lopsided";
|
||||||
}
|
}
|
||||||
else if (!feed.items().isEmpty()) {
|
else if (feed != null && !feed.items().isEmpty()) {
|
||||||
return "lopsided";
|
return "lopsided";
|
||||||
}
|
}
|
||||||
else if (!samples.isEmpty()) {
|
else if (samples != null && !samples.isEmpty()) {
|
||||||
return "lopsided";
|
return "lopsided";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
Loading…
Reference in New Issue
Block a user