diff options
author | V.Krishn <vkrishn4@gmail.com> | 2016-07-08 17:07:59 +0530 |
---|---|---|
committer | V.Krishn <vkrishn4@gmail.com> | 2016-07-08 17:07:59 +0530 |
commit | 3253ddeec7e6da8867c45c5ba114a804ea505c4d (patch) | |
tree | b01862af39709cb0fb8634a13eaefdd229b44fd1 | |
parent | d02dc72d4d6eccbae4cde1ce03d710c008d21331 (diff) | |
download | aport-api-3253ddeec7e6da8867c45c5ba114a804ea505c4d.tar.bz2 |
fix search/contents param combining
-rw-r--r-- | index.php | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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; } |