? .cvsignore ? .gitignore ? 528086-protwords-54-D6.patch ? 983572-non-empty-filters-8-D6.patch ? Solr_Base_Query.php-6.x-2.x ? apachesolr-6.x-2.x-dev.tar.gz Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/CHANGELOG.txt,v retrieving revision 1.1.2.194 diff -u -p -r1.1.2.194 CHANGELOG.txt --- CHANGELOG.txt 20 Dec 2010 03:01:29 -0000 1.1.2.194 +++ CHANGELOG.txt 29 Jan 2011 02:49:26 -0000 @@ -2,10 +2,11 @@ Apache Solr Search Integration x.x-x.x, xxxx-xx-xx ------------------------------ -#957652 by aegnor, pwolanin: fix str_replace may remove a substring in filter_extract. Apache Solr Search Integration 6.x-1.3, xxxx-xx-xx ------------------------------ +#528086 by pwolanin: Fix for special html entity search and display bugs. +#957652 by aegnor, pwolanin: fix str_replace may remove a substring in filter_extract. #983458 by craig_: respect apachesolr_read_only setting for mass updates, use defined constants. #983572 by amateescu, pwolanin: fix for empty filter values causing Solr error. #949768 by pwolanin: Index more CCK fields by default. Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/README.txt,v retrieving revision 1.1.2.1.2.37 diff -u -p -r1.1.2.1.2.37 README.txt --- README.txt 11 Oct 2010 17:18:39 -0000 1.1.2.1.2.37 +++ README.txt 29 Jan 2011 02:49:26 -0000 @@ -87,6 +87,10 @@ Similarly, move apache-solr-1.4.1/exampl it like solrconfig.bak. Then move the solrconfig.xml that comes with the ApacheSolr Drupal module to take its place. +Finally, move apache-solr-1.4.1/example/solr/conf/protwords.txt and rename +it like protwords.bak. Then move the protwords.txt that comes with the +ApacheSolr Drupal module to take its place. + Now start the solr application by opening a shell, changing directory to apache-solr-1.4.1/example, and executing the command java -jar start.jar Index: apachesolr.index.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.index.inc,v retrieving revision 1.1.2.31 diff -u -p -r1.1.2.31 apachesolr.index.inc --- apachesolr.index.inc 10 Dec 2010 03:40:47 -0000 1.1.2.31 +++ apachesolr.index.inc 29 Jan 2011 02:49:26 -0000 @@ -22,7 +22,7 @@ function apachesolr_clean_text($text) { // Add spaces before stripping tags to avoid running words together. $text = filter_xss(str_replace(array('<', '>'), array(' <', '> '), $text), array()); // Decode entities and then make safe any < or > characters. - return htmlspecialchars(html_entity_decode($text, ENT_NOQUOTES, 'UTF-8'), ENT_NOQUOTES, 'UTF-8'); + return htmlspecialchars(html_entity_decode($text, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8'); } /** Index: apachesolr.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v retrieving revision 1.1.2.12.2.213 diff -u -p -r1.1.2.12.2.213 apachesolr.module --- apachesolr.module 10 Dec 2010 03:40:47 -0000 1.1.2.12.2.213 +++ apachesolr.module 29 Jan 2011 02:49:27 -0000 @@ -1376,7 +1376,7 @@ function apachesolr_do_query($caller, $c $solr = apachesolr_get_solr(); // We must run htmlspecialchars() here since converted entities are in the index. // and thus bare entities &, > or < won't match. - $response = $solr->search(htmlspecialchars($keys, ENT_NOQUOTES, 'UTF-8'), $params['start'], $params['rows'], $params); + $response = $solr->search(htmlspecialchars($keys, ENT_QUOTES, 'UTF-8'), $params['start'], $params['rows'], $params); // The response is cached so that it is accessible to the blocks and anything // else that needs it beyond the initial search. apachesolr_static_response_cache($response, $caller); Index: schema.xml =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/schema.xml,v retrieving revision 1.1.2.1.2.38 diff -u -p -r1.1.2.1.2.38 schema.xml --- schema.xml 1 Jul 2010 02:42:07 -0000 1.1.2.1.2.38 +++ schema.xml 29 Jan 2011 02:49:27 -0000 @@ -11,7 +11,7 @@ http://wiki.apache.org/solr/SchemaXml --> - +