[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17356] API: order of parametres in url
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17356] API: order of parametres in url |
Date: |
Thu, 23 Nov 2017 07:04:49 -0500 (EST) |
Revision: 17356
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17356
Author: sigurdne
Date: 2017-11-23 07:04:49 -0500 (Thu, 23 Nov 2017)
Log Message:
-----------
API: order of parametres in url
Modified Paths:
--------------
trunk/phpgwapi/inc/class.sessions.inc.php
Modified: trunk/phpgwapi/inc/class.sessions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.sessions.inc.php 2017-11-23 11:53:17 UTC (rev
17355)
+++ trunk/phpgwapi/inc/class.sessions.inc.php 2017-11-23 12:04:49 UTC (rev
17356)
@@ -706,7 +706,16 @@
{
if ( is_array($extravars) )
{
- $extravars =
array_merge($this->_get_session_vars(), $extravars);
+ $_session_vars =
$this->_get_session_vars();
+ /*
+ * Make sure session vars are
inserted at the end of the array
+ * easier to read...
+ */
+ foreach ($_session_vars as
$_session_key => $_session_value)
+ {
+
unset($extravars[$_session_key]);
+
$extravars[$_session_key] = $_session_value;
+ }
}
else
{
@@ -1523,8 +1532,8 @@
{
return array
(
- session_name() => $this->_verified ?
$this->_sessionid : null,
- 'domain' =>
$this->_account_domain
+ 'domain' =>
$this->_account_domain,
+ session_name() => $this->_verified ?
$this->_sessionid : null
);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17356] API: order of parametres in url,
sigurdne <=