Author: jfthomps
Date: Mon May 15 17:10:17 2017
New Revision: 1795228
URL: http://svn.apache.org/viewvc?rev=1795228&view=rev
Log:
VCL-1044 - getVariable returns wrong value if $incparams == 1 and variable has
been set in $_SESSION['variables']
utils.php: modified getVariable: added to conditional checking for variable in
$_SESSION['variables'] to skip check and get data from database if $incparams
is passed as 1
Modified:
vcl/trunk/web/.ht-inc/utils.php
Modified: vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1795228&r1=1795227&r2=1795228&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Mon May 15 17:10:17 2017
@@ -11807,7 +11807,7 @@ function getShibauthData($id) {
///
////////////////////////////////////////////////////////////////////////////////
function getVariable($key, $default=NULL, $incparams=0) {
- if(array_key_exists($key, $_SESSION['variables']))
+ if(array_key_exists($key, $_SESSION['variables']) && ! $incparams)
return $_SESSION['variables'][$key];
$query = "SELECT serialization, ";
if($incparams)
