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

[dhaun at iowaoutdoors.org]

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

Modified Files:
	lib-story.php 
Log Message:
Make the {story_topic_id} and {story_topic_name} variables available even if the story's topic icon has been switched off.


Index: lib-story.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-story.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lib-story.php	25 Aug 2004 21:25:48 -0000	1.4
--- lib-story.php	26 Aug 2004 19:13:28 -0000	1.5
***************
*** 134,140 ****
      }
  
      if( $_USER['noicons'] != 1 AND $A['show_topic_icon'] == 1 )
      {
-         $topicname = htmlspecialchars( stripslashes( $A['topic'] ));
          $topicurl = $_CONF['site_url'] . '/index.php?topic=' . $A['tid'];
          if( !empty( $A['imageurl'] ))
--- 134,143 ----
      }
  
+     $topicname = htmlspecialchars( stripslashes( $A['topic'] ));
+     $article->set_var( 'story_topic_id', $A['tid'] );
+     $article->set_var( 'story_topic_name', $topicname );
+ 
      if( $_USER['noicons'] != 1 AND $A['show_topic_icon'] == 1 )
      {
          $topicurl = $_CONF['site_url'] . '/index.php?topic=' . $A['tid'];
          if( !empty( $A['imageurl'] ))
***************
*** 155,160 ****
              $article->set_var( 'story_topic_image', $topicimage );
          }
-         $article->set_var( 'story_topic_id', $A['tid'] );
-         $article->set_var( 'story_topic_name', $topicname );
          $article->set_var( 'story_topic_url', $topicurl );
      }
--- 158,161 ----