Commit 1347bb818bcffc339010ff742c6ad7357c5db149
1 parent
41af04e9
KTS-1839
"Malformed SQL syntax in Criteria,inc file. " Fixed. Reviewed By: Kevin git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6424 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
2 additions
and
2 deletions
lib/browse/Criteria.inc
| @@ -681,7 +681,7 @@ class GeneralMetadataCriterion extends BrowseCriterion { | @@ -681,7 +681,7 @@ class GeneralMetadataCriterion extends BrowseCriterion { | ||
| 681 | 681 | ||
| 682 | 682 | ||
| 683 | function searchSQL ($aRequest) { | 683 | function searchSQL ($aRequest) { |
| 684 | - $val = array('('.$this->getSearchTable() . "." . $this->getSearchField() . " LIKE '%!%' or dm.name LIKE '%!%' )", | 684 | + $val = array('('.$this->getSearchTable() . "." . $this->getSearchField() . " LIKE '%!%' OR dm.name LIKE '%!%' )", |
| 685 | array(DBUtil::escapeSimple($aRequest[$this->getWidgetBase()]),DBUtil::escapeSimple($aRequest[$this->getWidgetBase()]))); | 685 | array(DBUtil::escapeSimple($aRequest[$this->getWidgetBase()]),DBUtil::escapeSimple($aRequest[$this->getWidgetBase()]))); |
| 686 | 686 | ||
| 687 | return $val; | 687 | return $val; |
| @@ -1120,7 +1120,7 @@ class TagCloudCriterion extends BrowseCriterion { | @@ -1120,7 +1120,7 @@ class TagCloudCriterion extends BrowseCriterion { | ||
| 1120 | function searchJoinSQL () { | 1120 | function searchJoinSQL () { |
| 1121 | global $default; | 1121 | global $default; |
| 1122 | return "INNER JOIN document_tags AS DTS ON DTS.document_id = D.id | 1122 | return "INNER JOIN document_tags AS DTS ON DTS.document_id = D.id |
| 1123 | - INNER JOIN tag_words AS TWS ON tws.id = DTS.tag_id"; | 1123 | + INNER JOIN tag_words AS TWS ON TWS.id = DTS.tag_id"; |
| 1124 | } | 1124 | } |
| 1125 | } | 1125 | } |
| 1126 | 1126 |