Peter M. Groen / knowledgetree

Commit 4140651402b2dbbe628f65a10ff37b4d2a9f65ba

Authored by kevin_fourie
1 parent 25818579

Merged in from STABLE trunk... 

KTS-3652
"Created a Field set with an '&' performed an advanced search and received an error"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3a-Release-Branch@9215 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 11 additions and 9 deletions
search2/search/fieldRegistry.inc.php
  View file @4140651
... ... @@ -6,31 +6,31 @@
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2008 KnowledgeTree Inc.
8 8 * Portions copyright The Jam Warehouse Software (Pty) Limited
9   - *
  9 + *
10 10 * This program is free software; you can redistribute it and/or modify it under
11 11 * the terms of the GNU General Public License version 3 as published by the
12 12 * Free Software Foundation.
13   - *
  13 + *
14 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16 16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17 17 * details.
18   - *
  18 + *
19 19 * You should have received a copy of the GNU General Public License
20 20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21   - *
22   - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  21 + *
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
23 23 * California 94120-7775, or email info@knowledgetree.com.
24   - *
  24 + *
25 25 * The interactive user interfaces in modified source and object code versions
26 26 * of this program must display Appropriate Legal Notices, as required under
27 27 * Section 5 of the GNU General Public License version 3.
28   - *
  28 + *
29 29 * In accordance with Section 7(b) of the GNU General Public License version 3,
30 30 * these Appropriate Legal Notices must retain the display of the "Powered by
31   - * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
32 32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
33   - * must display the words "Powered by KnowledgeTree" and retain the original
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
34 34 * copyright notice.
35 35 * Contributor( s): ______________________________________
36 36 *
... ... @@ -163,6 +163,7 @@ class ExprFieldRegistry
163 163 {
164 164 $fieldset = $fieldset->getValue();
165 165 }
  166 + $fieldset = html_entity_decode($fieldset);
166 167 if (!array_key_exists($fieldset,$this->metadata))
167 168 {
168 169 throw new ResolutionException("Metadata class for fieldset '$fieldset' and field '$field' not found.");
... ... @@ -171,6 +172,7 @@ class ExprFieldRegistry
171 172 {
172 173 $field = $field->getValue();
173 174 }
  175 + $field = html_entity_decode($field);
174 176 if (!array_key_exists($field,$this->metadata[$fieldset]))
175 177 {
176 178 throw new ResolutionException("Metadata class for fieldset '$fieldset' and field '$field' not found.");
... ...