[phpwiki-checkins] CVS: phpwiki admin.php,1.5,1.5.2.1 index.php,1.5.2.1,1.5.2.2

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8407

Modified Files:
      Tag: release-1_2-branch
	admin.php index.php 
Log Message:
2004-11-28 19:19 rurban
Release 1.2.5
* admin.php, index.php, lib/config.php(global, compute_default_scripturl): 
  import _SERVER and _GET/_POST to support register_globals=off
* admin.php: on (un)lock=pagename display the (un)lock'ed page not FrontPage
* lib/pgsql.php, lib/config.php: add pg_user and pg_pass
  (patch #1001339 by Jack Twilley)
* lib/dbalib.php, lib/dbmlib.php, lib/db_filesystem: fix GetAllWikiPagenames()
  using $dbi['wiki']. This fixes zip and dumpserial on dba, dbm and file.
* lib/msql.php: typo in GetAllWikiPageNames(). 
  This fixes zip and dumpserial on msql.



Index: admin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/Attic/admin.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -2 -b -p -d -r1.5 -r1.5.2.1
--- admin.php	13 Nov 2000 10:59:27 -0000	1.5
+++ admin.php	7 Jan 2005 13:59:57 -0000	1.5.2.1
@@ -4,7 +4,13 @@
 
    define('WIKI_ADMIN', true);	// has to be before includes
+   if (!ini_get('register_globals')) {
+       extract($HTTP_SERVER_VARS);
+   }
 
    include("lib/config.php");
    include("lib/stdlib.php");
+   if (!ini_get('register_globals')) {
+       import_request_variables('gps');
+   }
 
    // set these to your preferences. For heaven's sake
@@ -33,4 +39,5 @@
    if (isset($lock) || isset($unlock)) {
       include ('admin/lockpage.php');
+      $QUERY_STRING = $pagename;
    } elseif (isset($zip)) {
       include ('lib/ziplib.php');

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -2 -b -p -d -r1.5.2.1 -r1.5.2.2
--- index.php	18 Aug 2001 00:35:10 -0000	1.5.2.1
+++ index.php	7 Jan 2005 13:59:57 -0000	1.5.2.2
@@ -14,4 +14,7 @@
       $dbi = OpenDataBase($WikiPageStore);
    }
+   if (!ini_get('register_globals')) {
+       import_request_variables('gps');
+   }
 
    // Allow choice of submit buttons to determine type of search: