Changeset:
31ed162e3fc3
https://sourceforge.net/p/mrbs/hg-code/ci/31ed162e3fc3d4f100f22ad4846e8ca4754b77b5
Author:
Campbell Morrison <[email protected]>
Date:
Wed Nov 04 10:41:15 2015 +0000
Log message:
Added a return NULL statement to make it clear what's happening (no change to
result)
diffstat:
web/session/session_php.inc | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (28 lines):
diff -r 752367eba43f -r 31ed162e3fc3 web/session/session_php.inc
--- a/web/session/session_php.inc Mon Oct 26 12:11:04 2015 +0000
+++ b/web/session/session_php.inc Wed Nov 04 10:41:15 2015 +0000
@@ -227,18 +227,18 @@
function getUserName()
{
+ global $HTTP_SESSION_VARS;
+
if (isset($_SESSION) && isset($_SESSION["UserName"]) &&
($_SESSION["UserName"] !== ''))
{
return $_SESSION["UserName"];
}
- else
+ elseif (isset($HTTP_SESSION_VARS["UserName"]) &&
($HTTP_SESSION_VARS["UserName"] !== ''))
{
- global $HTTP_SESSION_VARS;
- if (isset($HTTP_SESSION_VARS["UserName"]) &&
($HTTP_SESSION_VARS["UserName"] !== ''))
- {
- return $HTTP_SESSION_VARS["UserName"];
- }
+ return $HTTP_SESSION_VARS["UserName"];
}
+
+ return NULL;
}
// Print the logon entry on the top banner.
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
