[geeklog-cvs] geeklog-1.3/system lib-story.php,1.2,1.3

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv13863/system

Modified Files:
	lib-story.php 
Log Message:
Found a few more places where we did not properly use the article URL when URL rewriting is on.


Index: lib-story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-story.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lib-story.php	22 Aug 2004 17:53:22 -0000	1.2
--- lib-story.php	23 Aug 2004 12:38:53 -0000	1.3
***************
*** 205,209 ****
              {
                  $commentsUrl = COM_buildUrl( $_CONF['site_url']
!                         . '/article.php?story=' . $A['sid'] . '#comments' );
                  $article->set_var( 'comments_url', $commentsUrl );
                  $article->set_var( 'comments_text', $A['comments'] . ' '
--- 205,209 ----
              {
                  $commentsUrl = COM_buildUrl( $_CONF['site_url']
!                         . '/article.php?story=' . $A['sid'] ) . '#comments';
                  $article->set_var( 'comments_url', $commentsUrl );
                  $article->set_var( 'comments_text', $A['comments'] . ' '
***************
*** 355,359 ****
  * block next to a story (in article view).
  *
! * @param        string      $fulltext   the story text
  * @param        int         $uid        user id of the author
  * @param        int         $tid        topic id
--- 355,359 ----
  * block next to a story (in article view).
  *
! * @param        string      $related    contents of gl_stories 'related' field
  * @param        int         $uid        user id of the author
  * @param        int         $tid        topic id
***************
*** 366,371 ****
  
      // get the links from the story text
!     $rel = explode ("\n", $related);
!     if ((sizeof ($rel) == 1) && empty ($rel[0])) {
          $rel = array ();
      }
--- 366,372 ----
  
      // get the links from the story text
!     if (!empty ($related)) {
!         $rel = explode ("\n", $related);
!     } else {
          $rel = array ();
      }