projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/4.4' into 4.4-4.5-2014-09-14-13-58-42
[civicrm-core.git]
/
CRM
/
Core
/
Session.php
diff --git
a/CRM/Core/Session.php
b/CRM/Core/Session.php
index 964d42331537a2b877f549f0f31be3fc06ae5e1c..24f53be63f093c779df17d17550c100963b7a090 100644
(file)
--- a/
CRM/Core/Session.php
+++ b/
CRM/Core/Session.php
@@
-27,6
+27,10
@@
require_once "PEAR.php";
require_once "PEAR.php";
+
+/**
+ * Class CRM_Core_Session
+ */
class CRM_Core_Session {
/**
class CRM_Core_Session {
/**
@@
-520,6
+524,9
@@
class CRM_Core_Session {
}
}
}
}
+ /**
+ * @param $names
+ */
static function registerAndRetrieveSessionObjects($names) {
if (!is_array($names)) {
$names = array($names);
static function registerAndRetrieveSessionObjects($names) {
if (!is_array($names)) {
$names = array($names);
@@
-535,6
+542,9
@@
class CRM_Core_Session {
CRM_Core_BAO_Cache::restoreSessionFromCache($names);
}
CRM_Core_BAO_Cache::restoreSessionFromCache($names);
}
+ /**
+ * @param bool $reset
+ */
static function storeSessionObjects($reset = TRUE) {
if (empty(self::$_managedNames)) {
return;
static function storeSessionObjects($reset = TRUE) {
if (empty(self::$_managedNames)) {
return;
@@
-559,6
+569,9
@@
class CRM_Core_Session {
return $session->get('userID');
}
return $session->get('userID');
}
+ /**
+ * @return bool
+ */
function isEmpty() {
// check if session is empty, if so we dont cache
// stuff that we can get away with
function isEmpty() {
// check if session is empty, if so we dont cache
// stuff that we can get away with