[phpwiki-checkins] CVS: phpwiki index.php,1.4,1.5

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18319

Modified Files:
	index.php 
Log Message:
adapted, so that index.php can be included by admin.php

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** index.php	2000/11/01 11:31:40	1.4
--- index.php	2000/11/08 15:34:06	1.5
***************
*** 7,20 ****
     */
  
!    set_magic_quotes_runtime(0);
!    error_reporting(E_ALL ^ E_NOTICE);   // remove E_NOTICE for debugging
  
!    include "lib/config.php";
!    include "lib/stdlib.php";
  
-    // All requests require the database
-    $dbi = OpenDataBase($WikiPageStore);
- 
- 
     // Allow choice of submit buttons to determine type of search:
     if (isset($searchtype) && ($searchtype == 'full'))
--- 7,18 ----
     */
  
!    if (!defined('WIKI_ADMIN')) { // index.php not included by admin.php?
!       include "lib/config.php";
!       include "lib/stdlib.php";
  
!       // All requests require the database
!       $dbi = OpenDataBase($WikiPageStore);
!    }
  
     // Allow choice of submit buttons to determine type of search:
     if (isset($searchtype) && ($searchtype == 'full'))
***************
*** 24,28 ****
  
     if (isset($edit)) {
-       $admin_edit = 0;
        include "lib/editpage.php";
     } elseif (isset($links)) {
--- 22,25 ----