mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-09 00:40:11 +01:00
Merge branch 'search'. Descriptions are now being part of a search.
This commit is contained in:
commit
75b8993f53
@ -96,7 +96,6 @@ class FDroid
|
|||||||
}
|
}
|
||||||
|
|
||||||
return $out;
|
return $out;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -315,13 +314,16 @@ class FDroid
|
|||||||
case "summary":
|
case "summary":
|
||||||
$appinfo['summary']=$el;
|
$appinfo['summary']=$el;
|
||||||
break;
|
break;
|
||||||
|
case "description":
|
||||||
|
$appinfo['description']=$el;
|
||||||
|
break;
|
||||||
case "license":
|
case "license":
|
||||||
$appinfo['license']=$el;
|
$appinfo['license']=$el;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($query_vars['fdfilter']===null || $query_vars['fdfilter']!='' && (stristr($appinfo['name'],$query_vars['fdfilter']) || stristr($appinfo['summary'],$query_vars['fdfilter']))) {
|
if($query_vars['fdfilter']===null || $query_vars['fdfilter']!='' && (stristr($appinfo['name'],$query_vars['fdfilter']) || stristr($appinfo['summary'],$query_vars['fdfilter']) || stristr($appinfo['description'],$query_vars['fdfilter']))) {
|
||||||
if($skipped<($query_vars['fdpage']-1)*$outputter->perpage) {
|
if($skipped<($query_vars['fdpage']-1)*$outputter->perpage) {
|
||||||
$skipped++;
|
$skipped++;
|
||||||
} else if($got<$outputter->perpage) {
|
} else if($got<$outputter->perpage) {
|
||||||
@ -330,6 +332,7 @@ class FDroid
|
|||||||
}
|
}
|
||||||
$total++;
|
$total++;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$out.=$outputter->outputEnd();
|
$out.=$outputter->outputEnd();
|
||||||
|
Loading…
Reference in New Issue
Block a user