[Tikiwiki-cvs] tiki tiki-view_blog_post.php,1.18.2.2,1.18.2.3 tiki-read_article.php,1.20.2.3,1.20.2.4

[<ch...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20300

Modified Files:
      Tag: BRANCH-1-8
	tiki-view_blog_post.php tiki-read_article.php 
Log Message:
Fixes name collisions for $page : fixes articles page numbers and blogs' browser title


Index: tiki-view_blog_post.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_blog_post.php,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -d -r1.18.2.2 -r1.18.2.3
--- tiki-view_blog_post.php	28 Mar 2004 00:55:36 -0000	1.18.2.2
+++ tiki-view_blog_post.php	11 May 2004 01:00:05 -0000	1.18.2.3
@@ -118,7 +118,7 @@
 
 $smarty->assign('first_page', 1);
 $smarty->assign('last_page', $pages);
-$smarty->assign('page', $_REQUEST['page']);
+$smarty->assign('pagenum', $_REQUEST['page']);
 
 $smarty->assign('parsed_data', $parsed_data);
 

Index: tiki-read_article.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-read_article.php,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -u -d -r1.20.2.3 -r1.20.2.4
--- tiki-read_article.php	28 Mar 2004 00:55:35 -0000	1.20.2.3
+++ tiki-read_article.php	11 May 2004 01:00:05 -0000	1.20.2.4
@@ -107,7 +107,7 @@
 
 	$smarty->assign('first_page', 1);
 	$smarty->assign('last_page', $pages);
-	$smarty->assign('page', $_REQUEST['page']);
+	$smarty->assign('pagenum', $_REQUEST['page']);
 
 	$smarty->assign('body', $article_data["body"]);
 	$smarty->assign('publishDate', $article_data["publishDate"]);
@@ -154,7 +154,6 @@
 // Display the Index Template
 $smarty->assign('mid', 'tiki-read_article.tpl');
 $smarty->assign('show_page_bar', 'n');
-$smarty->assign('page', $title);    // Fix to display the article title in the browser titlebar instead of "1"
 $smarty->display("tiki.tpl");
 
 ?>