com web/bugs: Improce patch/pull search: include/query.php

Commit: 7da3ecbd76aaeb5bd8e881da7470eb72454b1714 Author: Johannes Schlüter <johannes@schlueters.de> Wed, 13 Feb 2013 01:05:13 +0100 Parents: 023e49bc2d52c361932e6416cf6c2e7894d980ca Branches: master Link: http://git.php.net/?p=web/bugs.git;a=commitdiff;h=7da3ecbd76aaeb5bd8e881da7470eb72454b1714 Log: Improce patch/pull search Changed paths: M include/query.php Diff: diff --git a/include/query.php b/include/query.php index 40455b2..cacf0ac 100644 --- a/include/query.php +++ b/include/query.php @@ -175,14 +175,16 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') if ($cve_id != '') { $where_clause .= " AND bugdb.cve_id {$cve_id_not} LIKE '" . $dbh->escape($cve_id) . "%'"; } - + + /* A search for patch&pull should be (patch or pull) */ + $where_clause .= " AND (1=2"; if ($patch != '') { - $where_clause .= " AND EXISTS (SELECT 1 FROM bugdb_patchtracker WHERE bugdb_id = bugdb.id LIMIT 1)"; + $where_clause .= " OR EXISTS (SELECT 1 FROM bugdb_patchtracker WHERE bugdb_id = bugdb.id LIMIT 1)"; } - if ($pull != '') { - $where_clause .= " AND EXISTS (SELECT 1 FROM bugdb_github WHERE bugdb_id = bugdb.id LIMIT 1)"; + $where_clause .= " OR EXISTS (SELECT 1 FROM bugdb_github WHERE bugdb_id = bugdb.id LIMIT 1)"; } + $where_clause .= ")"; if ($assign != '') { $where_clause .= ' AND bugdb.assign = ' . $dbh->quote($assign);