[geeklog-cvs] Geeklog-1.x/public_html article.php,1.95,1.96

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv33441/public_html

Modified Files:
	article.php 
Log Message:
Make {story_title} available in article.thtml since we have the story's title at hand already


Index: article.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** article.php	20 Feb 2008 20:07:58 -0000	1.95
--- article.php	18 May 2008 19:29:30 -0000	1.96
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | article.php                                                               |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | article.php                                                               |
***************
*** 9,13 ****
  // | Shows articles in various formats.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Shows articles in various formats.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 47,54 ****
  * Geeklog common function library
  */
! require_once ('lib-common.php');
! require_once ($_CONF['path_system'] . 'lib-story.php');
  if ($_CONF['trackback_enabled']) {
!     require_once ($_CONF['path_system'] . 'lib-trackback.php');
  }
  
--- 47,54 ----
  * Geeklog common function library
  */
! require_once 'lib-common.php';
! require_once $_CONF['path_system'] . 'lib-story.php';
  if ($_CONF['trackback_enabled']) {
!     require_once $_CONF['path_system'] . 'lib-trackback.php';
  }
  
***************
*** 144,148 ****
          $story_template = new Template ($_CONF['path_layout'] . 'article');
          $story_template->set_file ('article', 'printable.thtml');
!         $story_template->set_var ( 'xhtml', XHTML );
          $story_template->set_var ('page_title',
                  $_CONF['site_name'] . ': ' . $story->displayElements('title'));
--- 144,148 ----
          $story_template = new Template ($_CONF['path_layout'] . 'article');
          $story_template->set_file ('article', 'printable.thtml');
!         $story_template->set_var ('xhtml', XHTML);
          $story_template->set_var ('page_title',
                  $_CONF['site_name'] . ': ' . $story->displayElements('title'));
***************
*** 263,271 ****
          $story_template->set_file('article','article.thtml');
  
!         $story_template->set_var( 'xhtml', XHTML );
          $story_template->set_var('site_url', $_CONF['site_url']);
          $story_template->set_var('site_admin_url', $_CONF['site_admin_url']);
          $story_template->set_var('layout_url', $_CONF['layout_url']);
          $story_template->set_var('story_id', $story->getSid());
          $story_options = array ();
          if (($_CONF['hideemailicon'] == 0) && (!empty ($_USER['username']) ||
--- 263,272 ----
          $story_template->set_file('article','article.thtml');
  
!         $story_template->set_var('xhtml', XHTML);
          $story_template->set_var('site_url', $_CONF['site_url']);
          $story_template->set_var('site_admin_url', $_CONF['site_admin_url']);
          $story_template->set_var('layout_url', $_CONF['layout_url']);
          $story_template->set_var('story_id', $story->getSid());
+         $story_template->set_var('story_title', $pagetitle);
          $story_options = array ();
          if (($_CONF['hideemailicon'] == 0) && (!empty ($_USER['username']) ||
***************
*** 385,387 ****
  echo $display;
  
! ?>
\ No newline at end of file
--- 386,388 ----
  echo $display;
  
! ?>