Thread: [phpwiki-checkins] CVS: phpwiki/lib main.php,1.7,1.8

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv29310/lib
Modified Files:
	main.php 
Log Message:
Fix SF bug #132843 some more. Also add code to properly glean the
page name from obsolete 'index.php?PageName' style URLS.
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** main.php	2001年02月17日 21:52:08	1.7
--- main.php	2001年02月20日 13:44:03	1.8
***************
*** 18,22 ****
 {
 $LogEntry->status = 302;	// "302 Found"
! header("Location: " . SERVER_URL . $REQUEST_URI . '/');
 exit;
 }
--- 18,22 ----
 {
 $LogEntry->status = 302;	// "302 Found"
! header("Location: " . SERVER_URL . preg_replace('/(\?|$)/', '/1円', $REQUEST_URI, 1));
 exit;
 }
***************
*** 24,28 ****
 function DeducePagename () 
 {
! global $pagename, $PATH_INFO;
 
 if (isset($pagename))
--- 24,28 ----
 function DeducePagename () 
 {
! global $pagename, $PATH_INFO, $QUERY_STRING;
 
 if (isset($pagename))
***************
*** 36,39 ****
--- 36,42 ----
 }
 
+ if (isset($QUERY_STRING) && !preg_match('/[&=]/', $QUERY_STRING))
+ return urldecode(fix_magic_quotes_gpc($QUERY_STRING));
+ 
 return gettext("FrontPage");
 }