[Tikiwiki-cvs] tiki tiki-index.php,1.190,1.191

[<sy...@us...>]

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

Modified Files:
	tiki-index.php 
Log Message:
merge

Index: tiki-index.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- tiki-index.php	10 Aug 2007 13:42:39 -0000	1.190
+++ tiki-index.php	5 Sep 2007 15:12:22 -0000	1.191
@@ -6,7 +6,6 @@
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 
 // Initialization
-
 $section = 'wiki page';
 require_once('tiki-setup.php');
 include_once('lib/structures/structlib.php');
@@ -416,6 +415,10 @@
     $info['is_html']=false;
 }
 
+$cat_type = 'wiki page';
+$cat_objid = $page;
+include_once('tiki-section_options.php');
+
 $smarty->assign('cached_page','n');
 if(isset($info['wiki_cache'])) {$wiki_cache=$info['wiki_cache'];}
 if($wiki_cache>0) {
@@ -517,10 +520,6 @@
     $smarty->assign('atts_count',count($atts['data']));
 }
 
-$cat_type = 'wiki page';
-$cat_objid = $page;
-include_once('tiki-section_options.php');
-
 $smarty->assign('footnote','');
 $smarty->assign('has_footnote','n');
 if($feature_wiki_footnotes == 'y') {