[geeklog-cvs] geeklog-1.3/public_html search.php,1.46,1.47

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv15942

Modified Files:
	search.php 
Log Message:
Fixed link to search results in poll comments.


Index: search.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/search.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** search.php	14 Dec 2002 20:50:42 -0000	1.46
--- search.php	9 Jan 2003 09:30:36 -0000	1.47
***************
*** 328,332 ****
          $powhere .= "({$_TABLES['pollquestions']}.perm_anon IS NOT NULL)";
  
! 		$sql = "SELECT {$_TABLES['stories']}.sid,{$_TABLES['comments']}.title,comment,pid,{$_TABLES['comments']}.uid,type as comment_type,UNIX_TIMESTAMP({$_TABLES['comments']}.date) as day,'comment' as type FROM {$_TABLES['comments']} ";
          $sql .= "LEFT JOIN {$_TABLES['stories']} ON (({$_TABLES['stories']}.sid = {$_TABLES['comments']}.sid) AND (" . $stsql . ")) ";
          $sql .= "LEFT JOIN {$_TABLES['pollquestions']} ON ((qid = {$_TABLES['comments']}.sid) AND (" . $posql . ")) ";
--- 328,332 ----
          $powhere .= "({$_TABLES['pollquestions']}.perm_anon IS NOT NULL)";
  
! 		$sql = "SELECT {$_TABLES['stories']}.sid,{$_TABLES['pollquestions']}.qid,{$_TABLES['comments']}.title,comment,pid,{$_TABLES['comments']}.uid,type as comment_type,UNIX_TIMESTAMP({$_TABLES['comments']}.date) as day,'comment' as type FROM {$_TABLES['comments']} ";
          $sql .= "LEFT JOIN {$_TABLES['stories']} ON (({$_TABLES['stories']}.sid = {$_TABLES['comments']}.sid) AND (" . $stsql . ")) ";
          $sql .= "LEFT JOIN {$_TABLES['pollquestions']} ON ((qid = {$_TABLES['comments']}.sid) AND (" . $posql . ")) ";
***************
*** 431,435 ****
                              $searchresults->set_var('data', '<a href="article.php?story=' . $C['sid'] . '">' . stripslashes($C['title']) . '</a>');
                          } else {
!                             $searchresults->set_var('data', '<a href="pollbooth.php?qid=' . $C['sid'] . '&aid=-1#comments">' . stripslashes($C['title']) . '</a>');
                          }
                          $searchresults->parse('data_cols','resultcolumn',true);
--- 431,435 ----
                              $searchresults->set_var('data', '<a href="article.php?story=' . $C['sid'] . '">' . stripslashes($C['title']) . '</a>');
                          } else {
!                             $searchresults->set_var('data', '<a href="pollbooth.php?qid=' . $C['qid'] . '&aid=-1#comments">' . stripslashes($C['title']) . '</a>');
                          }
                          $searchresults->parse('data_cols','resultcolumn',true);