[geeklog-cvs] geeklog-1.3/system/classes search.class.php,1.4,1.5

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/system/classes
In directory internal.geeklog.net:/tmp/cvs-serv10090/system/classes

Modified Files:
	search.class.php 
Log Message:
Fixed display of intro phrase for "any" search results, moved hard-coded AND and OR to the language files.


Index: search.class.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/system/classes/search.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** search.class.php	23 Jun 2003 17:45:17 -0000	1.4
--- search.class.php	24 Jun 2003 15:17:46 -0000	1.5
***************
*** 649,658 ****
          $searchmain->set_var('num_matches', '');
          
!         if ($keyType == 'any') {
!         	$searchQuery = str_replace(' ', "</b>' OR '<b>",$query);
          	$searchQuery = "<b>'$searchQuery'</b>";
          } else {
              if ($this->_keyType == 'all') {
!                 $searchQuery = str_replace(' ', "</b>' AND '<b>",$this->_query);
                  $searchQuery = "<b>'$searchQuery'</b>";
              } else {
--- 649,658 ----
          $searchmain->set_var('num_matches', '');
          
!         if ($this->_keyType == 'any') {
!         	$searchQuery = str_replace(' ', "</b>' " . $LANG09[57] . " '<b>",$this->_query);
          	$searchQuery = "<b>'$searchQuery'</b>";
          } else {
              if ($this->_keyType == 'all') {
!                 $searchQuery = str_replace(' ', "</b>' " . $LANG09[56] . " '<b>",$this->_query);
                  $searchQuery = "<b>'$searchQuery'</b>";
              } else {