gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not call these functions twice

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-06-15 14:40:53 +05:30
parent cbf0ef1f24
commit 1a11a96134
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/pmd/history.js
View File

@ -731,14 +731,28 @@ function build_query(formtitle, fadin)
} else {
q_select += "* ";
}
q_select += "\nFROM " + query_from();
if (query_where() !== "") {
q_select += "\nWHERE ";
q_select += query_where();
var q_where = query_where();
if (q_where !== "") {
q_select += "\nWHERE " + q_where;
}
var q_groupby = query_groupby();
if (q_groupby !== "") {
q_select += "\nGROUP BY " + q_groupby;
}
var q_having = query_having();
if (q_having !== "") {
q_select += "\nHAVING " + q_having;
}
var q_orderby = query_orderby();
if (q_orderby !== "") {
q_select += "\nORDER BY " + q_orderby;
}
if (query_groupby() !== "") { q_select += "\nGROUP BY " + query_groupby(); }
if (query_having() !== "") { q_select += "\nHAVING " + query_having(); }
if (query_orderby() !== "") { q_select += "\nORDER BY " + query_orderby(); }
/**
* @var button_options Object containing options