aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV.Krishn <vkrishn4@gmail.com>2016-07-08 17:07:59 +0530
committerV.Krishn <vkrishn4@gmail.com>2016-07-08 17:07:59 +0530
commit3253ddeec7e6da8867c45c5ba114a804ea505c4d (patch)
treeb01862af39709cb0fb8634a13eaefdd229b44fd1
parentd02dc72d4d6eccbae4cde1ce03d710c008d21331 (diff)
downloadaport-api-3253ddeec7e6da8867c45c5ba114a804ea505c4d.tar.bz2
fix search/contents param combining
-rw-r--r--index.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/index.php b/index.php
index d9b8efb..d52a4e7 100644
--- a/index.php
+++ b/index.php
@@ -215,13 +215,12 @@ $app->get('/search/{where:[a-z0-9\_]+}{filters:.*}', function($where, $filters)
$filter2 = set_search_globname($filter2, 'pkgname');
$filter2 = set_search_globname($filter2, 'file');
- foreach($filter2['filter2'] as $k=>$v) {
- $filter2['filter2'][$k] = 'Files.'.$v;
+ foreach($filter2['filter2'] as $k=>$v) {
+ $filter['filter2'][] = $filter2['filter2'][$k] = 'Files.'.$v;
}
- foreach($filter1['filter2'] as $k=>$v) {
- $filter1['filter2'][$k] = 'Packages.'.$v;
+ foreach($filter1['filter2'] as $k=>$v) {
+ $filter['filter2'][] = $filter1['filter2'][$k] = 'Packages.'.$v;
}
- $filter['filter2'] = array_merge($filter2['filter2'], $filter1['filter2']);
$data = get_content($filter, $data, $app, 'Files');
$filter['filter'] = array_merge($filter2['filter'], $filter1['filter']);
@@ -294,6 +293,7 @@ function sanitize_filters($filters='', $where='', $app='') {
$filter = get2filter($filter);
//common filters
$filter['filter'] = array();
+ $filter['filter2'] = array();
$filter = set_search_page($filter, $app);
return $filter;
}