Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-14-11-16-10

[civicrm-core.git] / CRM / Core / BAO / Cache.php

diff --git a/CRM/Core/BAO/Cache.php b/CRM/Core/BAO/Cache.php
index a8c6c1c57c83e1aa8db5fb306c76ff409f8545b0..7b13b49d37d01aad6c0928700c5739f742f9d437 100644 (file)
--- a/CRM/Core/BAO/Cache.php
+++ b/CRM/Core/BAO/Cache.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -189,8 +189,8 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
    * delete the entire cache if group is not specified
    *
    * @param string $group The group name of the entries to be deleted
-   * @param string $path  path of the item that needs to be deleted
-   * @param booleab $clearAll clear all caches
+   * @param string $path path of the item that needs to be deleted
+   * @param bool|\booleab $clearAll clear all caches
    *
    * @return void
    * @static
@@ -278,6 +278,9 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
      * @access private
      */
 
+  /**
+   * @param $names
+   */
   static function restoreSessionFromCache($names) {
     foreach ($names as $key => $sessionName) {
       if (is_array($sessionName)) {
@@ -303,6 +306,10 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
    * Do periodic cleanup of the CiviCRM session table. Also delete all session cache entries
    * which are a couple of days old. This keeps the session cache to a manageable size
    *
+   * @param bool $session
+   * @param bool $table
+   * @param bool $prevNext
+   *
    * @return void
    * @static
    * @access private