[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[26562] branches/5.x/lib/setup/cookies.php

[<jon...@us...>]

Revision: 26562
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=26562&view=rev
Author:   jonnybradley
Date:     2010-04-09 22:11:42 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
[FIX] 3rd time on cookietabs, spot change of script

Modified Paths:
--------------
    branches/5.x/lib/setup/cookies.php

Modified: branches/5.x/lib/setup/cookies.php
===================================================================
--- branches/5.x/lib/setup/cookies.php	2010-04-09 19:26:49 UTC (rev 26561)
+++ branches/5.x/lib/setup/cookies.php	2010-04-09 22:11:42 UTC (rev 26562)
@@ -71,11 +71,11 @@
 		preg_match('/[\?\&]page=([^\&]*)/', $_SERVER['REQUEST_URI'], $q_match);	// admin & wiki pages
 		preg_match('/[\?\&]page=([^\&]*)/', $_SERVER['HTTP_REFERER'], $ref_match);
 		
-		if ((!isset($_COOKIE['tab_last_query']) || $_COOKIE['tab_last_query'] == $_SERVER['QUERY_STRING']) && (count($q_match) == 0 || $q_match == $ref_match)) {	// for admin includes when staying on same panel
+		if ((isset($_COOKIE['tab_last_query']) && $_COOKIE['tab_last_query'] == $_SERVER['SCRIPT_NAME '] . serialize($_GET)) || (count($q_match) == 0 || $q_match == $ref_match)) {	// for admin includes when staying on same panel
 			$cookietab = $_COOKIE['tab'];
 		}
 	}
-	setcookie('tab_last_query', $_SERVER['QUERY_STRING']);
+	setcookie('tab_last_query', $_SERVER['SCRIPT_NAME '] . serialize($_GET));
 	
 	if (empty($cookietab)) {
 		$cookietab = '1';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.